diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/char/consolemap.c | |
parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) |
Merge with 2.3.10.
Diffstat (limited to 'drivers/char/consolemap.c')
-rw-r--r-- | drivers/char/consolemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c index 7e97e1fe7..272074936 100644 --- a/drivers/char/consolemap.c +++ b/drivers/char/consolemap.c @@ -671,8 +671,8 @@ conv_uni_to_pc(struct vc_data *conp, long ucs) * initialized. It must be possible to call kmalloc(..., GFP_KERNEL) * from this function, hence the call from sys_setup. */ -__initfunc(void -console_map_init(void)) +void __init +console_map_init(void) { int i; |