From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 17 Apr 2008 22:46:34 +0000 (+0200)
Subject: ide: remove ppc ifdef from init_ide_data()
X-Git-Tag: v2.6.26-rc1~1148^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=26d799b729003220c0f3e5d9e046e1588c011897;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index a93f127b8bf..adecf45a084 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -211,10 +211,8 @@ 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
 	}
 }