Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / video / console / font_8x16.c

diff --git a/drivers/video/console/font_8x16.c b/drivers/video/console/font_8x16.c
index e6f8dbaa122bbc6ab37774e6caebf0f5973db12a..00a0c67a5c7d0e2051b7d273ed75104dfb95b2e3 100644 (file)
--- a/drivers/video/console/font_8x16.c
+++ b/drivers/video/console/font_8x16.c
@@ -5,10 +5,11 @@
 /**********************************************/
 
 #include <linux/font.h>
+#include <linux/module.h>
 
 #define FONTDATAMAX 4096
 
-static unsigned char fontdata_8x16[FONTDATAMAX] = {
+static const unsigned char fontdata_8x16[FONTDATAMAX] = {
 
        /* 0 0x00 '^@' */
        0x00, /* 00000000 */
@@ -4621,11 +4622,12 @@ static unsigned char fontdata_8x16[FONTDATAMAX] = {
 };
 
 
-struct font_desc font_vga_8x16 = {
-       VGA8x16_IDX,
-       "VGA8x16",
-       8,
-       16,
-       fontdata_8x16,
-       0
+const struct font_desc font_vga_8x16 = {
+       .idx    = VGA8x16_IDX,
+       .name   = "VGA8x16",
+       .width  = 8,
+       .height = 16,
+       .data   = fontdata_8x16,
+       .pref   = 0,
 };
+EXPORT_SYMBOL(font_vga_8x16);