aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/Kconfig3
-rw-r--r--drivers/ide/ide.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index a57893c03b7a..29dd99caaf50 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1089,9 +1089,6 @@ config BLK_DEV_IDEDMA
1089 def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \ 1089 def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \
1090 BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA 1090 BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
1091 1091
1092config IDE_ARCH_OBSOLETE_INIT
1093 def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC
1094
1095config IDE_ARCH_OBSOLETE_DEFAULTS 1092config IDE_ARCH_OBSOLETE_DEFAULTS
1096 def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32 1093 def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32
1097 1094
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index a1a02c74d77f..9b9b686fbacb 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -206,16 +206,16 @@ static void __init init_ide_data (void)
206 206
207 ide_init_port_data(hwif, index); 207 ide_init_port_data(hwif, index);
208 208
209#ifdef CONFIG_IDE_ARCH_OBSOLETE_INIT 209#ifdef CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS
210 memset(&hw, 0, sizeof(hw)); 210 memset(&hw, 0, sizeof(hw));
211 ide_std_init_ports(&hw, io_addr, ctl_addr); 211 ide_std_init_ports(&hw, io_addr, ctl_addr);
212 memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports)); 212 memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports));
213#endif
214 hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; 213 hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
215#if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI) 214#if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI)
216 hwif->irq = 215 hwif->irq =
217 ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); 216 ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
218#endif 217#endif
218#endif
219 } 219 }
220} 220}
221 221