diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/loongson/common/setup.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/loongson/common/setup.c')
| -rw-r--r-- | arch/mips/loongson/common/setup.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/mips/loongson/common/setup.c b/arch/mips/loongson/common/setup.c index 4cd2aa9a342c..27d826bc7103 100644 --- a/arch/mips/loongson/common/setup.c +++ b/arch/mips/loongson/common/setup.c | |||
| @@ -41,15 +41,12 @@ void __init plat_mem_setup(void) | |||
| 41 | conswitchp = &vga_con; | 41 | conswitchp = &vga_con; |
| 42 | 42 | ||
| 43 | screen_info = (struct screen_info) { | 43 | screen_info = (struct screen_info) { |
| 44 | 0, 25, /* orig-x, orig-y */ | 44 | .orig_x = 0, |
| 45 | 0, /* unused */ | 45 | .orig_y = 25, |
| 46 | 0, /* orig-video-page */ | 46 | .orig_video_cols = 80, |
| 47 | 0, /* orig-video-mode */ | 47 | .orig_video_lines = 25, |
| 48 | 80, /* orig-video-cols */ | 48 | .orig_video_isVGA = VIDEO_TYPE_VGAC, |
| 49 | 0, 0, 0, /* ega_ax, ega_bx, ega_cx */ | 49 | .orig_video_points = 16, |
| 50 | 25, /* orig-video-lines */ | ||
| 51 | VIDEO_TYPE_VGAC, /* orig-video-isVGA */ | ||
| 52 | 16 /* orig-video-points */ | ||
| 53 | }; | 50 | }; |
| 54 | #elif defined(CONFIG_DUMMY_CONSOLE) | 51 | #elif defined(CONFIG_DUMMY_CONSOLE) |
| 55 | conswitchp = &dummy_con; | 52 | conswitchp = &dummy_con; |