Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

[cascardo/linux.git] / drivers / video / console / font_sun8x16.c

diff --git a/drivers/video/console/font_sun8x16.c b/drivers/video/console/font_sun8x16.c
index 41f910f..5abf290 100644 (file)
--- a/drivers/video/console/font_sun8x16.c
+++ b/drivers/video/console/font_sun8x16.c
@@ -262,14 +262,14 @@ static const unsigned char fontdata_sun8x16[FONTDATAMAX] = {
 };
 
 const struct font_desc font_sun_8x16 = {
-       SUN8x16_IDX,
-       "SUN8x16",
-       8,
-       16,
-       fontdata_sun8x16,
+       .idx    = SUN8x16_IDX,
+       .name   = "SUN8x16",
+       .width  = 8,
+       .height = 16,
+       .data   = fontdata_sun8x16,
 #ifdef __sparc__
-       10
+       .pref   = 10,
 #else
-       -1
+       .pref   = -1,
 #endif
 };