aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/arm/ide_arm.c1
-rw-r--r--drivers/ide/ide.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 1a03a2a285e..21ba6ac2f82 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -35,7 +35,6 @@ void __init ide_arm_init(void)
35 35
36 hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); 36 hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
37 if (hwif) { 37 if (hwif) {
38 ide_init_port_data(hwif, hwif->index);
39 ide_init_port_hw(hwif, &hw); 38 ide_init_port_hw(hwif, &hw);
40 } 39 }
41} 40}
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 3ec220b64d0..77af743425e 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -218,9 +218,6 @@ static void __init init_ide_data (void)
218 ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); 218 ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
219#endif 219#endif
220 } 220 }
221#ifdef CONFIG_IDE_ARM
222 ide_arm_init();
223#endif
224} 221}
225 222
226/** 223/**
@@ -1774,6 +1771,9 @@ static int __init ide_init(void)
1774 1771
1775 proc_ide_create(); 1772 proc_ide_create();
1776 1773
1774#ifdef CONFIG_IDE_ARM
1775 ide_arm_init();
1776#endif
1777#ifdef CONFIG_BLK_DEV_ALI14XX 1777#ifdef CONFIG_BLK_DEV_ALI14XX
1778 if (probe_ali14xx) 1778 if (probe_ali14xx)
1779 (void)ali14xx_init(); 1779 (void)ali14xx_init();