aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/sibyte
diff options
context:
space:
mode:
authorGravatar Sebastian Andrzej Siewior <sebastian@breakpoint.cc> 2010-04-21 22:36:47 +0200
committerGravatar Ralf Baechle <ralf@linux-mips.org> 2010-04-30 20:52:42 +0100
commitb20947aaa0026efd7355ae4bf70b56a13a3f98b1 (patch)
tree9be5f52cef2740c33290efcd63b2c1832365d9ae /arch/mips/sibyte
parentMIPS: cmpxchg.h: Fix excessive indentation. (diff)
downloadlinux-b20947aaa0026efd7355ae4bf70b56a13a3f98b1.tar.gz
linux-b20947aaa0026efd7355ae4bf70b56a13a3f98b1.tar.bz2
linux-b20947aaa0026efd7355ae4bf70b56a13a3f98b1.zip
MIPS: Fixup screen_info struct initializations
|arch/mips/sibyte/swarm/setup.c:153: | warning: large integer implicitly truncated to unsigned type The field was changed in d9b26352 aka ("x86, setup: Store the boot cursor state"). This patch changes the values back they way they were before this extra field got introduced. While here, the other two boards are also converted to C99 initializer. Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1137/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sibyte')
-rw-r--r--arch/mips/sibyte/swarm/setup.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index 5277aac96b0f..c308989fc464 100644
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -145,15 +145,14 @@ void __init plat_mem_setup(void)
#ifdef CONFIG_VT
screen_info = (struct screen_info) {
- 0, 0, /* orig-x, orig-y */
- 0, /* unused */
- 52, /* orig_video_page */
- 3, /* orig_video_mode */
- 80, /* orig_video_cols */
- 4626, 3, 9, /* unused, ega_bx, unused */
- 25, /* orig_video_lines */
- 0x22, /* orig_video_isVGA */
- 16 /* orig_video_points */
+ .orig_video_page = 52,
+ .orig_video_mode = 3,
+ .orig_video_cols = 80,
+ .flags = 12,
+ .orig_video_ega_bx = 3,
+ .orig_video_lines = 25,
+ .orig_video_isVGA = 0x22,
+ .orig_video_points = 16,
};
/* XXXKW for CFE, get lines/cols from environment */
#endif