From 18eaf3f8525d3d0d0c5b2183a6dffe8a2aee5d06 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Jan 2008 20:13:06 +0100
Subject: [PATCH] --- yaml --- r: 77256 b: refs/heads/master c:
 944000921d41c5aacfda6515ad3a0bbde52f8fa3 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ide/arm/ide_arm.c | 1 -
 trunk/drivers/ide/ide.c         | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index db20e406d4a9..a67821db6078 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb010c180294a5242a7681555c28737d9dd26ab
+refs/heads/master: 944000921d41c5aacfda6515ad3a0bbde52f8fa3
diff --git a/trunk/drivers/ide/arm/ide_arm.c b/trunk/drivers/ide/arm/ide_arm.c
index 1a03a2a285ef..21ba6ac2f826 100644
--- a/trunk/drivers/ide/arm/ide_arm.c
+++ b/trunk/drivers/ide/arm/ide_arm.c
@@ -35,7 +35,6 @@ void __init ide_arm_init(void)
 
 	hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
 	if (hwif) {
-		ide_init_port_data(hwif, hwif->index);
 		ide_init_port_hw(hwif, &hw);
 	}
 }
diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c
index 3ec220b64d0b..77af743425e8 100644
--- a/trunk/drivers/ide/ide.c
+++ b/trunk/drivers/ide/ide.c
@@ -218,9 +218,6 @@ static void __init init_ide_data (void)
 			ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
 #endif
 	}
-#ifdef CONFIG_IDE_ARM
-	ide_arm_init();
-#endif
 }
 
 /**
@@ -1774,6 +1771,9 @@ static int __init ide_init(void)
 
 	proc_ide_create();
 
+#ifdef CONFIG_IDE_ARM
+	ide_arm_init();
+#endif
 #ifdef CONFIG_BLK_DEV_ALI14XX
 	if (probe_ali14xx)
 		(void)ali14xx_init();