diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-15 11:30:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-21 18:26:10 +0100 |
| commit | 617d1464ab1a572d3a1e46c7cea5d7247ed45d8a (patch) | |
| tree | 61a5de4b635f3469a59a0d3346329d439462158a /arch/arm/mach-footbridge/cats-hw.c | |
| parent | ARM: footbridge: fix build with PCI disabled (diff) | |
| download | linux-617d1464ab1a572d3a1e46c7cea5d7247ed45d8a.tar.xz linux-617d1464ab1a572d3a1e46c7cea5d7247ed45d8a.zip | |
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: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-footbridge/cats-hw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c index 9669cc0b6318..da0415094856 100644 --- a/arch/arm/mach-footbridge/cats-hw.c +++ b/arch/arm/mach-footbridge/cats-hw.c @@ -78,9 +78,11 @@ __initcall(cats_hw_init); static void __init 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_points = 16; screen_info.orig_y = 24; +#endif } MACHINE_START(CATS, "Chalice-CATS") |