Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[linux-2.6] / drivers / ata / pata_platform.c

diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 9dc628931e99cda7fb23d98c05e4da14c7eeeaf4..fc72a965643d8951f45e5957d98fc5924fefae24 100644 (file)
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -69,7 +69,6 @@ static struct scsi_host_template pata_platform_sht = {
 static struct ata_port_operations pata_platform_port_ops = {
        .set_mode               = pata_platform_set_mode,
 
-       .port_disable           = ata_port_disable,
        .tf_load                = ata_tf_load,
        .tf_read                = ata_tf_read,
        .check_status           = ata_check_status,
@@ -89,7 +88,6 @@ static struct ata_port_operations pata_platform_port_ops = {
 
        .irq_clear              = ata_bmdma_irq_clear,
        .irq_on                 = ata_irq_on,
-       .irq_ack                = ata_irq_ack,
 
        .port_start             = ata_dummy_ret0,
 };
@@ -210,6 +208,10 @@ static int __devinit pata_platform_probe(struct platform_device *pdev)
        pp_info = pdev->dev.platform_data;
        pata_platform_setup_port(&ap->ioaddr, pp_info);
 
+       ata_port_desc(ap, "%s cmd 0x%llx ctl 0x%llx", mmio ? "mmio" : "ioport",
+                     (unsigned long long)io_res->start,
+                     (unsigned long long)ctl_res->start);
+
        /* activate */
        return ata_host_activate(host, platform_get_irq(pdev, 0),
                                 ata_interrupt, pp_info ? pp_info->irq_flags