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

[pandora-kernel.git] / drivers / video / console / font_sun12x22.c

diff --git a/drivers/video/console/font_sun12x22.c b/drivers/video/console/font_sun12x22.c
index c7bd967..d364385 100644 (file)
--- a/drivers/video/console/font_sun12x22.c
+++ b/drivers/video/console/font_sun12x22.c
@@ -2,7 +2,7 @@
 
 #define FONTDATAMAX 11264
 
-static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
+static const unsigned char fontdata_sun12x22[FONTDATAMAX] = {
 
        /* 0 0x00 '^@' */
        0x00, 0x00, /* 000000000000 */
@@ -6151,15 +6151,15 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
 };
 
 
-struct font_desc font_sun_12x22 = {
-       SUN12x22_IDX,
-       "SUN12x22",
-       12,
-       22,
-       fontdata_sun12x22,
+const struct font_desc font_sun_12x22 = {
+       .idx    = SUN12x22_IDX,
+       .name   = "SUN12x22",
+       .width  = 12,
+       .height = 22,
+       .data   = fontdata_sun12x22,
 #ifdef __sparc__
-       5
+       .pref   = 5,
 #else
-       -1
+       .pref   = -1,
 #endif
 };