Merge commit 'v2.6.34' into next

1 files changed, 3 insertions, 9 deletions

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 7043f6b9ff3c..0d0f054a02f4 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -76,15 +76,9 @@ void __init plat_mem_setup(void)
 
 #ifdef CONFIG_VT
         screen_info = (struct screen_info) {
-                0, 0,           /* orig-x, orig-y */
-                0,              /* unused */
-                0,              /* orig_video_page */
-                0,              /* orig_video_mode */
-                160,            /* orig_video_cols */
-                0, 0, 0,        /* unused, ega_bx, unused */
-                64,             /* orig_video_lines */
-                0,              /* orig_video_isVGA */
-                16              /* orig_video_points */
+                .orig_video_cols        = 160,
+                .orig_video_lines       = 64,
+                .orig_video_points      = 16,
         };
 #endif