diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/video/promcon.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/video/promcon.c')
| -rw-r--r-- | drivers/video/promcon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/promcon.c b/drivers/video/promcon.c index 984edab98..e58d32ed1 100644 --- a/drivers/video/promcon.c +++ b/drivers/video/promcon.c @@ -1,4 +1,4 @@ -/* $Id: promcon.c,v 1.15 1999/04/22 06:35:32 davem Exp $ +/* $Id: promcon.c,v 1.16 1999/08/10 15:56:22 davem Exp $ * Console driver utilizing PROM sun terminal emulation * * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) @@ -104,7 +104,7 @@ promcon_end(struct vc_data *conp, char *b) return b - p; } -__initfunc(const char *promcon_startup(void)) +const char __init *promcon_startup(void) { const char *display_desc = "PROM"; int node; @@ -128,8 +128,8 @@ __initfunc(const char *promcon_startup(void)) return display_desc; } -__initfunc(static void -promcon_init_unimap(struct vc_data *conp)) +static void __init +promcon_init_unimap(struct vc_data *conp) { mm_segment_t old_fs = get_fs(); struct unipair *p, *p1; @@ -591,7 +591,7 @@ struct consw prom_con = { con_invert_region: NULL, }; -__initfunc(void prom_con_init(void)) +void __init prom_con_init(void) { #ifdef CONFIG_DUMMY_CONSOLE if (conswitchp == &dummy_con) |