diff options
| -rw-r--r-- | arch/ppc/platforms/pplus.c | 23 | ||||
| -rw-r--r-- | drivers/ide/ide.c | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c index 8a1788c..384cdfe 100644 --- a/arch/ppc/platforms/pplus.c +++ b/arch/ppc/platforms/pplus.c @@ -695,28 +695,6 @@ static unsigned long pplus_ide_default_io_base(int index) return 0; } } - -static void __init -pplus_ide_init_hwif_ports(hw_regs_t * hw, unsigned long data_port, - unsigned long ctrl_port, int *irq) -{ - unsigned long reg = data_port; - int i; - - for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) { - hw->io_ports[i] = reg; - reg += 1; - } - - if (ctrl_port) - hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port; - else - hw->io_ports[IDE_CONTROL_OFFSET] = - hw->io_ports[IDE_DATA_OFFSET] + 0x206; - - if (irq != NULL) - *irq = pplus_ide_default_irq(data_port); -} #endif #ifdef CONFIG_SMP @@ -887,7 +865,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) ppc_ide_md.default_irq = pplus_ide_default_irq; ppc_ide_md.default_io_base = pplus_ide_default_io_base; - ppc_ide_md.ide_init_hwif = pplus_ide_init_hwif_ports; #endif #ifdef CONFIG_SERIAL_TEXT_DEBUG diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 9e4d503..7e6418f 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 |
