diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl> | 2004-05-21 23:01:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-21 23:01:44 -0700 |
| commit | 58148fac604e8b740b0f0471d6a41e1caa50f6ac (patch) | |
| tree | 572706ce1bb8188e76d648ac3735506ce65d54be | |
| parent | cbc6f01b05246a9ec52803d0e851c86d91a10494 (diff) | |
[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
| -rw-r--r-- | drivers/ide/ide.c | 3 | ||||
| -rw-r--r-- | include/asm-arm26/ide.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 3aceb9107644..dd69ad46f578 100644 --- 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 7c8e435bdf8a..2d29108ec100 100644 --- 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__ */ |