diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:34 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:34 +0200 |
| commit | 26d799b729003220c0f3e5d9e046e1588c011897 (patch) | |
| tree | 18a5a2a7c5292922b77281c32a4d81238355f250 | |
| parent | 9dfcd15a6dc1ef81307295e08b797fa9212be71a (diff) | |
| download | linux-26d799b729003220c0f3e5d9e046e1588c011897.tar.bz2 | |
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>
| -rw-r--r-- | drivers/ide/ide.c | 2 |
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) ide_std_init_ports(&hw, io_addr, ctl_addr); memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports)); hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; -#if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI) hwif->irq = ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); #endif -#endif } } |