Signed-off-by: Andrew Morton --- drivers/ide/Kconfig | 3 --- drivers/ide/ide.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff -puN drivers/ide/Kconfig~ide-mm-ide-remove-config_ide_arch_obsolete_init drivers/ide/Kconfig --- a/drivers/ide/Kconfig~ide-mm-ide-remove-config_ide_arch_obsolete_init +++ a/drivers/ide/Kconfig @@ -1096,9 +1096,6 @@ config BLK_DEV_IDEDMA def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \ BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA -config IDE_ARCH_OBSOLETE_INIT - def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC - config IDE_ARCH_OBSOLETE_DEFAULTS def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32 diff -puN drivers/ide/ide.c~ide-mm-ide-remove-config_ide_arch_obsolete_init drivers/ide/ide.c --- a/drivers/ide/ide.c~ide-mm-ide-remove-config_ide_arch_obsolete_init +++ a/drivers/ide/ide.c @@ -208,16 +208,16 @@ static void __init init_ide_data (void) ide_init_port_data(hwif, index); -#ifdef CONFIG_IDE_ARCH_OBSOLETE_INIT +#ifdef CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS memset(&hw, 0, sizeof(hw)); ide_std_init_ports(&hw, io_addr, ctl_addr); 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_PPLUS) || !defined(CONFIG_PCI) hwif->irq = ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); #endif +#endif } } _