From: Bartlomiej Zolnierkiewicz Date: Thu, 17 Apr 2008 22:46:34 +0000 (+0200) Subject: ide: remove ppc ifdef from init_ide_data() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=26d799b729003220c0f3e5d9e046e1588c011897;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.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 --- 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,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 } }