diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:31 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:31 +0200 |
| commit | 5d682e4407d8364c286650baafcccae54d4b7c89 (patch) | |
| tree | 9aacb4fbecb21c7c2adbe99f431a684a0bd7977b /drivers | |
| parent | 7ef8df81def587ddb610b1c6f4572178ce0a97a6 (diff) | |
| download | kernel-common-5d682e4407d8364c286650baafcccae54d4b7c89.tar.gz kernel-common-5d682e4407d8364c286650baafcccae54d4b7c89.tar.bz2 kernel-common-5d682e4407d8364c286650baafcccae54d4b7c89.zip | |
ppc/pplus: remove ppc_ide_md.ide_init_hwif hook
* Call ide_init_default_irq() for pplus in init_ide_data().
* Remove no longer needed pplus_ide_init_hwif_ports().
There should be no functional changes caused by this patch.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/ide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 9e4d503bc716..7e6418fe3a84 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -212,7 +212,7 @@ static void __init init_ide_data (void) memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports)); #endif hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; -#if !defined(CONFIG_PPC32) || !defined(CONFIG_PCI) +#if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI) hwif->irq = ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); #endif |