diff options
Diffstat (limited to 'drivers/ide/q40ide.c')
| -rw-r--r-- | drivers/ide/q40ide.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c index ab49a97023d9..90786083b439 100644 --- a/drivers/ide/q40ide.c +++ b/drivers/ide/q40ide.c | |||
| @@ -51,9 +51,7 @@ static int q40ide_default_irq(unsigned long base) | |||
| 51 | /* | 51 | /* |
| 52 | * Addresses are pretranslated for Q40 ISA access. | 52 | * Addresses are pretranslated for Q40 ISA access. |
| 53 | */ | 53 | */ |
| 54 | static void q40_ide_setup_ports(struct ide_hw *hw, unsigned long base, | 54 | static void q40_ide_setup_ports(struct ide_hw *hw, unsigned long base, int irq) |
| 55 | ide_ack_intr_t *ack_intr, | ||
| 56 | int irq) | ||
| 57 | { | 55 | { |
| 58 | memset(hw, 0, sizeof(*hw)); | 56 | memset(hw, 0, sizeof(*hw)); |
| 59 | /* BIG FAT WARNING: | 57 | /* BIG FAT WARNING: |
| @@ -69,7 +67,6 @@ static void q40_ide_setup_ports(struct ide_hw *hw, unsigned long base, | |||
| 69 | hw->io_ports.ctl_addr = Q40_ISA_IO_B(base + 0x206); | 67 | hw->io_ports.ctl_addr = Q40_ISA_IO_B(base + 0x206); |
| 70 | 68 | ||
| 71 | hw->irq = irq; | 69 | hw->irq = irq; |
| 72 | hw->ack_intr = ack_intr; | ||
| 73 | } | 70 | } |
| 74 | 71 | ||
| 75 | static void q40ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, | 72 | static void q40ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, |
| @@ -156,7 +153,7 @@ static int __init q40ide_init(void) | |||
| 156 | release_region(pcide_bases[i], 8); | 153 | release_region(pcide_bases[i], 8); |
| 157 | continue; | 154 | continue; |
| 158 | } | 155 | } |
| 159 | q40_ide_setup_ports(&hw[i], pcide_bases[i], NULL, | 156 | q40_ide_setup_ports(&hw[i], pcide_bases[i], |
| 160 | q40ide_default_irq(pcide_bases[i])); | 157 | q40ide_default_irq(pcide_bases[i])); |
| 161 | 158 | ||
| 162 | hws[i] = &hw[i]; | 159 | hws[i] = &hw[i]; |
