diff options
| author | Harald Koerfgen <hkoerfg@web.de> | 1999-05-02 20:56:18 +0000 |
|---|---|---|
| committer | Harald Koerfgen <hkoerfg@web.de> | 1999-05-02 20:56:18 +0000 |
| commit | 9258cfc6e1c91e593152120a59983c9e9f761855 (patch) | |
| tree | 59682d43c39a936d433b91d345bcd4dfa31cc3c8 /drivers | |
| parent | 4a7fdfbd17814fc999257f81256fe34e4bd20bdd (diff) | |
Some minor bugfixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/genhd.c | 1 | ||||
| -rw-r--r-- | drivers/char/dz.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c index 68201da87..edb8a41cc 100644 --- a/drivers/block/genhd.c +++ b/drivers/block/genhd.c @@ -1224,6 +1224,7 @@ static int ultrix_partition(struct gendisk *hd, kdev_t dev, unsigned long first_ label->pt_part[i].pi_blkoff, label->pt_part[i].pi_nblocks); brelse(bh); + printk ("\n"); return 1; } else { brelse(bh); diff --git a/drivers/char/dz.c b/drivers/char/dz.c index 347638591..c26a448e8 100644 --- a/drivers/char/dz.c +++ b/drivers/char/dz.c @@ -1401,7 +1401,7 @@ __initfunc(int dz_init(void)) static void dz_console_put_char (unsigned char ch) { long flags; - int loops = 1000; + int loops = 2500; unsigned short tmp = ch; /* this code sends stuff out to serial device - spinning its wheels and waiting. */ @@ -1513,7 +1513,10 @@ __initfunc(static int dz_console_setup(struct console *co, char *options)) /* TOFIX: force to console line */ dz_console = &multi[CONSOLE_LINE]; + if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100)) dz_console->port = KN01_DZ11_BASE; + else + dz_console->port = KN02_DZ11_BASE; dz_console->line = CONSOLE_LINE; dz_out(dz_console, DZ_CSR, DZ_CLR); @@ -1541,7 +1544,10 @@ __initfunc(static int dz_console_setup(struct console *co, char *options)) /* TOFIX: force to console line */ dz_console = &multi[CONSOLE_LINE]; + if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100)) dz_console->port = KN01_DZ11_BASE; + else + dz_console->port = KN02_DZ11_BASE; dz_console->line = CONSOLE_LINE; dz_out(dz_console, DZ_CSR, DZ_CLR); |