diff options
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index a1a02c74d77f..9b9b686fbacb 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -206,16 +206,16 @@ static void __init init_ide_data (void) | |||
206 | 206 | ||
207 | ide_init_port_data(hwif, index); | 207 | ide_init_port_data(hwif, index); |
208 | 208 | ||
209 | #ifdef CONFIG_IDE_ARCH_OBSOLETE_INIT | 209 | #ifdef CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS |
210 | memset(&hw, 0, sizeof(hw)); | 210 | memset(&hw, 0, sizeof(hw)); |
211 | ide_std_init_ports(&hw, io_addr, ctl_addr); | 211 | ide_std_init_ports(&hw, io_addr, ctl_addr); |
212 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports)); | 212 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports)); |
213 | #endif | ||
214 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; | 213 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; |
215 | #if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI) | 214 | #if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI) |
216 | hwif->irq = | 215 | hwif->irq = |
217 | ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); | 216 | ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); |
218 | #endif | 217 | #endif |
218 | #endif | ||
219 | } | 219 | } |
220 | } | 220 | } |
221 | 221 | ||