diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /include/asm-arm/arch-arc/ide.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'include/asm-arm/arch-arc/ide.h')
| -rw-r--r-- | include/asm-arm/arch-arc/ide.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/asm-arm/arch-arc/ide.h b/include/asm-arm/arch-arc/ide.h index 9da7a9c56..8cc1baaa4 100644 --- a/include/asm-arm/arch-arc/ide.h +++ b/include/asm-arm/arch-arc/ide.h @@ -2,17 +2,33 @@ * linux/include/asm-arm/arch-arc/ide.h * * Copyright (c) 1997,1998 Russell King + * + * IDE definitions for the Acorn Archimedes/A5000 + * architecture + * + * Modifications: + * 04-04-1998 PJB Merged `arc' and `a5k' versions */ +#include <linux/config.h> + static __inline__ int ide_default_irq(ide_ioreg_t base) { +#ifdef CONFIG_ARCH_A5K + if (base == 0x1f0) + return 11; +#endif return 0; } static __inline__ ide_ioreg_t ide_default_io_base(int index) { +#ifdef CONFIG_ARCH_A5K + if (index == 0) + return 0x1f0; +#endif return 0; } |