Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...

[firefly-linux-kernel-4.4.55.git] / drivers / video / console / font_8x8.c

diff --git a/drivers/video/console/font_8x8.c b/drivers/video/console/font_8x8.c
index 26199f8ee908103f0065eb12068832e4bf6f61f4..9f56efe2cee728ffb075c64d9419b093bf66c4f4 100644 (file)
--- a/drivers/video/console/font_8x8.c
+++ b/drivers/video/console/font_8x8.c
@@ -2574,10 +2574,10 @@ static const unsigned char fontdata_8x8[FONTDATAMAX] = {
 
 
 const struct font_desc font_vga_8x8 = {
-       VGA8x8_IDX,
-       "VGA8x8",
-       8,
-       8,
-       fontdata_8x8,
-       0
+       .idx    = VGA8x8_IDX,
+       .name   = "VGA8x8",
+       .width  = 8,
+       .height = 8,
+       .data   = fontdata_8x8,
+       .pref   = 0,
 };