summaryrefslogtreecommitdiffstats
path: root/drivers/video/dummycon.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /drivers/video/dummycon.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'drivers/video/dummycon.c')
-rw-r--r--drivers/video/dummycon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/dummycon.c b/drivers/video/dummycon.c
index ea8743495..ecabee5e5 100644
--- a/drivers/video/dummycon.c
+++ b/drivers/video/dummycon.c
@@ -25,7 +25,7 @@
#define DUMMY_ROWS 25
#endif
-__initfunc(static const char *dummycon_startup(void))
+static const char __init *dummycon_startup(void)
{
return "dummy device";
}