Merge branch 'topic/sscape-fix' into for-linus

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

diff --git a/drivers/video/console/font_mini_4x6.c b/drivers/video/console/font_mini_4x6.c
index d818234fdf11e760b9dfb26c2df18259e0b06da9..a19a7f33133e80e995e004c6b1a74486c8e4fb6e 100644 (file)
--- a/drivers/video/console/font_mini_4x6.c
+++ b/drivers/video/console/font_mini_4x6.c
@@ -2148,11 +2148,11 @@ static const unsigned char fontdata_mini_4x6[FONTDATAMAX] = {
 };
 
 const struct font_desc font_mini_4x6 = {
-       MINI4x6_IDX,
-       "MINI4x6",
-       4,
-       6,
-       fontdata_mini_4x6,
-       3
+       .idx    = MINI4x6_IDX,
+       .name   = "MINI4x6",
+       .width  = 4,
+       .height = 6,
+       .data   = fontdata_mini_4x6,
+       .pref   = 3,
 };