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-i386/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-i386/ide.h')
| -rw-r--r-- | include/asm-i386/ide.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h index b1c21cc62..e61802fec 100644 --- a/include/asm-i386/ide.h +++ b/include/asm-i386/ide.h @@ -16,7 +16,7 @@ typedef unsigned short ide_ioreg_t; #ifndef MAX_HWIFS -#define MAX_HWIFS 4 +#define MAX_HWIFS 6 #endif #define ide_sti() sti() @@ -28,6 +28,8 @@ static __inline__ int ide_default_irq(ide_ioreg_t base) case 0x170: return 15; case 0x1e8: return 11; case 0x168: return 10; + case 0x1e0: return 8; + case 0x160: return 12; default: return 0; } @@ -40,6 +42,8 @@ static __inline__ ide_ioreg_t ide_default_io_base(int index) case 1: return 0x170; case 2: return 0x1e8; case 3: return 0x168; + case 4: return 0x1e0; + case 5: return 0x160; default: return 0; } |