Commit 58148fac authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[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
parent cbc6f01b
...@@ -314,9 +314,10 @@ static void __init init_ide_data (void) ...@@ -314,9 +314,10 @@ static void __init init_ide_data (void)
ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]); ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
#endif #endif
} }
#ifdef CONFIG_IDE_ARM #ifdef CONFIG_IDE_ARM
initializing = 1;
ide_arm_init(); ide_arm_init();
initializing = 0;
#endif #endif
} }
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define ide_default_irq(b) (0) #define ide_default_irq(b) (0)
#define IDE_ARCH_OBSOLETE_INIT #define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ #define ide_default_io_ctl(base) (0)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment