summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2016-11-15 18:08:07 -0800
committerMax Filippov <jcmvbkbc@gmail.com>2016-11-15 23:54:57 -0800
commit03eae3aca94c1e598be3ff40af492e1ca299577b (patch)
tree9dbfe0625f35871c01272ef2da205582acbcde0d /arch
parent709fb1f961ea5c287107c3f903e81c9529224c8b (diff)
xtensa: fix screen_info, clean up unused declarations in setup.c
screen_info on xtensa has old style initializer without field names. It was broken by the commit d9b263528e01 ("x86, setup: Store the boot cursor state") that split the unused2 field into two. Rewrite screen_info initialization with explicit field names. Drop unused declarations/tentative definitions of RTC- and FD-related structures. Drop inclusion of linux/timex.h when RTC is enabled in configuration. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/xtensa/kernel/setup.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 88a044af7504..80ed169dce07 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -31,10 +31,6 @@
# include <linux/console.h>
#endif
-#ifdef CONFIG_RTC
-# include <linux/timex.h>
-#endif
-
#ifdef CONFIG_PROC_FS
# include <linux/seq_file.h>
#endif
@@ -55,17 +51,16 @@
#include <platform/hardware.h>
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
-struct screen_info screen_info = { 0, 24, 0, 0, 0, 80, 0, 0, 0, 24, 1, 16};
-#endif
-
-#ifdef CONFIG_BLK_DEV_FD
-extern struct fd_ops no_fd_ops;
-struct fd_ops *fd_ops;
+struct screen_info screen_info = {
+ .orig_x = 0,
+ .orig_y = 24,
+ .orig_video_cols = 80,
+ .orig_video_lines = 24,
+ .orig_video_isVGA = 1,
+ .orig_video_points = 16,
+};
#endif
-extern struct rtc_ops no_rtc_ops;
-struct rtc_ops *rtc_ops;
-
#ifdef CONFIG_BLK_DEV_INITRD
extern unsigned long initrd_start;
extern unsigned long initrd_end;
@@ -77,7 +72,6 @@ extern int initrd_below_start_ok;
void *dtb_start = __dtb_start;
#endif
-unsigned char aux_device_present;
extern unsigned long loops_per_jiffy;
/* Command line specified as configuration option. */