[PATCH] two fixups for my ARM/ARM26 IDE changes

- initializing needs to be set to 1 before calling ide_arm_init()

- ide_default_io_ctl() should be 0 on arm26

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 3aceb91076449ef2153afc9492fc5015111de278..dd69ad46f5789af66c6fbb8a1fd68140eb766ac4 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -314,9 +314,10 @@ static void __init init_ide_data (void)
                        ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
 #endif
        }
-
 #ifdef CONFIG_IDE_ARM
+       initializing = 1;
        ide_arm_init();
+       initializing = 0;
 #endif
 }
 

diff --git a/include/asm-arm26/ide.h b/include/asm-arm26/ide.h
index 7c8e435bdf8a7c27e0f8056a7fe9f842746dde1a..2d29108ec10076a0373c11db388f87320e454921 100644 (file)
--- a/include/asm-arm26/ide.h
+++ b/include/asm-arm26/ide.h
@@ -36,7 +36,7 @@
 #define ide_default_irq(b)             (0)
 
 #define IDE_ARCH_OBSOLETE_INIT
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
+#define ide_default_io_ctl(base)       (0)
 
 #endif /* __KERNEL__ */