Commit 617d1464 authored by Arnd Bergmann's avatar Arnd Bergmann

ARM: footbridge: make screen_info setup conditional

The global screen_info structure is used to communicate
data about the console from platform code to the console
driver, but is only defined on ARM if either the VGA or
dummy consoles are in use.

This changes the footbridge code so we don't try to access
this structure in case it is not defined, which prevents
a possible randconfig build error.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
parent 570977a1
...@@ -78,9 +78,11 @@ __initcall(cats_hw_init); ...@@ -78,9 +78,11 @@ __initcall(cats_hw_init);
static void __init static void __init
fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi) fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi)
{ {
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
screen_info.orig_video_lines = 25; screen_info.orig_video_lines = 25;
screen_info.orig_video_points = 16; screen_info.orig_video_points = 16;
screen_info.orig_y = 24; screen_info.orig_y = 24;
#endif
} }
MACHINE_START(CATS, "Chalice-CATS") MACHINE_START(CATS, "Chalice-CATS")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment