Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6.git] / drivers / ide / legacy / q40ide.c

diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 16ba70b460967212df4e9d8c92de675dd9f6fbc3..a73db1bd482d6ecbdcf023f72aba169e61595f4b 100644 (file)
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -89,9 +89,8 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
                else
                        hw->io_ports[i] = Q40_ISA_IO_B(base + offsets[i]);
        }
                else
                        hw->io_ports[i] = Q40_ISA_IO_B(base + offsets[i]);
        }

-       
+

        hw->irq = irq;
        hw->irq = irq;

-       hw->dma = NO_DMA;

        hw->ack_intr = ack_intr;
 /*
  *     hw->iops = iops;
        hw->ack_intr = ack_intr;
 /*
  *     hw->iops = iops;


@@ -142,7 +141,7 @@ void q40ide_init(void)
                        0, NULL,
 //                     m68kide_iops,
                        q40ide_default_irq(pcide_bases[i]));
                        0, NULL,
 //                     m68kide_iops,
                        q40ide_default_irq(pcide_bases[i]));

-       index = ide_register_hw(&hw, 1, &hwif);
+       index = ide_register_hw(&hw, NULL, 1, &hwif);

        // **FIXME**
        if (index != -1)
                hwif->mmio = 1;
        // **FIXME**
        if (index != -1)
                hwif->mmio = 1;