Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

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

diff --git a/drivers/video/console/font_7x14.c b/drivers/video/console/font_7x14.c
index 1fa7fcf2ff72aa8008da6e0c4aad458d1e9607d7..3b7dbf9c060b33eb55d33938ec13c4cfeab03fe9 100644 (file)
--- a/drivers/video/console/font_7x14.c
+++ b/drivers/video/console/font_7x14.c
@@ -7,7 +7,7 @@
 
 #define FONTDATAMAX 3584
 
-static unsigned char fontdata_7x14[FONTDATAMAX] = {
+static const unsigned char fontdata_7x14[FONTDATAMAX] = {
 
        /* 0 0x00 '^@' */
        0x00, /* 0000000 */
@@ -4108,11 +4108,11 @@ static unsigned char fontdata_7x14[FONTDATAMAX] = {
 };
 
 
-struct font_desc font_7x14 = {
-       FONT7x14_IDX,
-       "7x14",
-       7,
-       14,
-       fontdata_7x14,
-       0
+const struct font_desc font_7x14 = {
+       .idx    = FONT7x14_IDX,
+       .name   = "7x14",
+       .width  = 7,
+       .height = 14,
+       .data   = fontdata_7x14,
+       .pref   = 0,
 };