Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6-omap-h63xx.git] / drivers / video / console / font_6x11.c

diff --git a/drivers/video/console/font_6x11.c b/drivers/video/console/font_6x11.c
index c52f1294044a29145364c6375de641bdb5e82c96..46e86e67aa6aa8d1411c25403864064bab43adc4 100644 (file)
--- a/drivers/video/console/font_6x11.c
+++ b/drivers/video/console/font_6x11.c
@@ -8,7 +8,7 @@
 
 #define FONTDATAMAX (11*256)
 
-static unsigned char fontdata_6x11[FONTDATAMAX] = {
+static const unsigned char fontdata_6x11[FONTDATAMAX] = {
 
        /* 0 0x00 '^@' */
        0x00, /* 00000000 */
@@ -3341,11 +3341,12 @@ static unsigned char fontdata_6x11[FONTDATAMAX] = {
 };
 
 
-struct font_desc font_vga_6x11 = {
-       VGA6x11_IDX,
-       "ProFont6x11",
-       6,
-       11,
-       fontdata_6x11,
-       -2000   /* Try avoiding this font if possible unless on MAC */
+const struct font_desc font_vga_6x11 = {
+       .idx    = VGA6x11_IDX,
+       .name   = "ProFont6x11",
+       .width  = 6,
+       .height = 11,
+       .data   = fontdata_6x11,
+       /* Try avoiding this font if possible unless on MAC */
+       .pref   = -2000,
 };