Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/video/console/font_10x18.c b/drivers/video/console/font_10x18.c
index e6aa0eab5bb6b464c95b124d952fb52e5774c887..6be72bb218ee4d65e95ad6377b56d6ee5038e88f 100644 (file)
--- a/drivers/video/console/font_10x18.c
+++ b/drivers/video/console/font_10x18.c
@@ -5133,14 +5133,14 @@ static const unsigned char fontdata_10x18[FONTDATAMAX] = {
 
 
 const struct font_desc font_10x18 = {
-       FONT10x18_IDX,
-       "10x18",
-       10,
-       18,
-       fontdata_10x18,
+       .idx    = FONT10x18_IDX,
+       .name   = "10x18",
+       .width  = 10,
+       .height = 18,
+       .data   = fontdata_10x18,
 #ifdef __sparc__
-       5
+       .pref   = 5,
 #else
-       -1
+       .pref   = -1,
 #endif
 };