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 /drivers/block/xd.c | |
| 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 'drivers/block/xd.c')
| -rw-r--r-- | drivers/block/xd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/xd.c b/drivers/block/xd.c index c71d1f8e8..7a26e28ac 100644 --- a/drivers/block/xd.c +++ b/drivers/block/xd.c @@ -208,6 +208,7 @@ __initfunc(static u_char xd_detect (u_char *controller, unsigned int *address)) for (j = 1; j < (sizeof(xd_sigs) / sizeof(xd_sigs[0])) && !found; j++) if (check_signature(xd_bases[i] + xd_sigs[j].offset,xd_sigs[j].string,strlen(xd_sigs[j].string))) { *controller = j; + xd_type = j; *address = xd_bases[i]; found++; } @@ -705,9 +706,10 @@ __initfunc(static void xd_dtc_init_controller (unsigned int address)) switch (address) { case 0x00000: case 0xC8000: break; /*initial: 0x320 */ - case 0xCA000: xd_iobase = 0x324; break; + case 0xCA000: if (xd[3]<=0) xd_iobase = 0x324; + break; case 0xD0000: /*5150CX*/ - case 0xD8000: break; /*5150CX*/ + case 0xD8000: break; /*5150CX & 5150XL*/ default: printk("xd_dtc_init_controller: unsupported BIOS address %06x\n",address); break; } |