lxfb: add power management functionality

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

diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 2f0b34d892a1cffe5822b47d524f15adc8c10bd4..a3573d40b4b77e524539faf2129f93f7c1de273e 100644 (file)
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -66,16 +66,12 @@ static int q40ide_default_irq(unsigned long base)
 
 
 /*
- * This is very similar to ide_setup_ports except that addresses
- * are pretranslated for q40 ISA access
+ * Addresses are pretranslated for Q40 ISA access.
  */
 void q40_ide_setup_ports ( hw_regs_t *hw,
                        unsigned long base, int *offsets,
                        unsigned long ctrl, unsigned long intr,
                        ide_ack_intr_t *ack_intr,
-/*
- *                     ide_io_ops_t *iops,
- */
                        int irq)
 {
        int i;
@@ -84,17 +80,14 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
        for (i = 0; i < IDE_NR_PORTS; i++) {
                /* BIG FAT WARNING: 
                   assumption: only DATA port is ever used in 16 bit mode */
-               if ( i==0 )
-                       hw->io_ports[i] = Q40_ISA_IO_W(base + offsets[i]);
+               if (i == 0)
+                       hw->io_ports_array[i] = Q40_ISA_IO_W(base + offsets[i]);
                else
-                       hw->io_ports[i] = Q40_ISA_IO_B(base + offsets[i]);
+                       hw->io_ports_array[i] = Q40_ISA_IO_B(base + offsets[i]);
        }
 
        hw->irq = irq;
        hw->ack_intr = ack_intr;
-/*
- *     hw->iops = iops;
- */
 }
 
 
@@ -144,11 +137,10 @@ static int __init q40ide_init(void)
 //                     m68kide_iops,
                        q40ide_default_irq(pcide_bases[i]));
 
-       hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+       hwif = ide_find_port();
        if (hwif) {
                ide_init_port_data(hwif, hwif->index);
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
 
                idx[i] = hwif->index;
        }
@@ -160,3 +152,5 @@ static int __init q40ide_init(void)
 }
 
 module_init(q40ide_init);
+
+MODULE_LICENSE("GPL");