aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:34 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:34 -0400
commit26d799b729003220c0f3e5d9e046e1588c011897 (patch)
tree18a5a2a7c5292922b77281c32a4d81238355f250 /drivers/ide/ide.c
parent9dfcd15a6dc1ef81307295e08b797fa9212be71a (diff)
ide: remove ppc ifdef from init_ide_data()
On PPC32 ide_init_default_irq() is non-zero only for PPLUS and PPC_PREP (the latter marked as BROKEN currently) so this ifdef can be removed. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r--drivers/ide/ide.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index a93f127b8bf2..adecf45a0849 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -211,11 +211,9 @@ static void __init init_ide_data (void)
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 hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; 213 hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
214#if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI)
215 hwif->irq = 214 hwif->irq =
216 ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); 215 ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
217#endif 216#endif
218#endif
219 } 217 }
220} 218}
221 219