Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

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

diff --git a/drivers/video/console/font_acorn_8x8.c b/drivers/video/console/font_acorn_8x8.c
index 2d2e39632e2d72032d402cc124b0baf22e8f2af3..639e31ae1100ae5511948e6a538b1cbdb75b62e7 100644 (file)
--- a/drivers/video/console/font_acorn_8x8.c
+++ b/drivers/video/console/font_acorn_8x8.c
@@ -1,6 +1,5 @@
 /* Acorn-like font definition, with PC graphics characters */
 
-#include <linux/config.h>
 #include <linux/font.h>
 
 static const unsigned char acorndata_8x8[] = {
@@ -263,14 +262,14 @@ static const unsigned char acorndata_8x8[] = {
 };
 
 const struct font_desc font_acorn_8x8 = {
-       ACORN8x8_IDX,
-       "Acorn8x8",
-       8,
-       8,
-       acorndata_8x8,
+       .idx    = ACORN8x8_IDX,
+       .name   = "Acorn8x8",
+       .width  = 8,
+       .height = 8,
+       .data   = acorndata_8x8,
 #ifdef CONFIG_ARCH_ACORN
-       20
+       .pref   = 20,
 #else
-       0
+       .pref   = 0,
 #endif
 };