diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-24 22:16:13 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-24 22:16:13 +0000 |
| commit | c8d701be3840f92e6459dabd99c9ca5d9b46a09f (patch) | |
| tree | bab6ffbf173eda290325f57fcd0aaeb0dce973ed /include/linux/console.h | |
| parent | b190539857b5b952e71e316de72ba1447774d654 (diff) | |
More merging. Chainsaw style.
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 6df950101..efb0003ea 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -48,12 +48,11 @@ struct consw { extern struct consw *conswitchp; -extern struct consw dummy_con; /* dummy console buffer */ -extern struct consw fb_con; /* frame buffer based console */ -extern struct consw vga_con; /* VGA text console */ +extern struct consw dummy_con; /* dummy console buffer */ +extern struct consw fb_con; /* frame buffer based console */ +extern struct consw vga_con; /* VGA text console */ extern struct consw newport_con; /* SGI Newport console */ -extern struct consw compat_con; /* console wrapper */ -extern struct consw prom_con; /* SPARC PROM console */ +extern struct consw prom_con; /* SPARC PROM console */ void take_over_console(struct consw *sw, int first, int last, int deflt); void give_up_console(struct consw *sw); |