diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/ide/buddha.c | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/ide/buddha.c')
| -rw-r--r-- | drivers/ide/buddha.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/buddha.c b/drivers/ide/buddha.c index 710b6654d..7ef6f645a 100644 --- a/drivers/ide/buddha.c +++ b/drivers/ide/buddha.c @@ -117,19 +117,15 @@ static int __init find_buddha(void) buddha_num_hwifs = 0; while ((z = zorro_find_device(ZORRO_WILDCARD, z))) { unsigned long board; - const char *name; - if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA) { + if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA) buddha_num_hwifs = BUDDHA_NUM_HWIFS; - name = "Buddha IDE Interface"; - } else if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_CATWEASEL) { + else if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_CATWEASEL) buddha_num_hwifs = CATWEASEL_NUM_HWIFS; - name = "Catweasel IDE Interface and Floppy Controller"; - } else + else continue; board = z->resource.start; if (!request_mem_region(board+BUDDHA_BASE1, 0x800, "IDE")) continue; - strcpy(z->name, name); buddha_board = ZTWO_VADDR(board); /* write to BUDDHA_IRQ_MR to enable the board IRQ */ *(char *)(buddha_board+BUDDHA_IRQ_MR) = 0; |