diff options
| author |   Andrew Murray <andrew.murray@arm.com> | 2018-09-13 12:56:40 +0100 |
|---|---|---|
| committer |   Catalin Marinas <catalin.marinas@arm.com> | 2018-09-21 12:12:24 +0100 |
| commit | 0b8af74549c2f985bfc3d2a983961b2a66882890 (patch) | |
| tree | d1156e0cbe2e4447c23aa693a7acb908bc004795 /arch/arm64/kernel/setup.c | |
| parent | arm64: Kconfig: Remove ARCH_HAS_HOLES_MEMORYMODEL (diff) | |
| download | linux-dev-0b8af74549c2f985bfc3d2a983961b2a66882890.tar.xz linux-dev-0b8af74549c2f985bfc3d2a983961b2a66882890.zip | |
arm64: Remove unused VGA console support
Support for VGA_CONSOLE is not allowable due to commit ee23794b8668
("video: vgacon: Don't build on arm64"), thus remove the associated
unused code.
Whilst PCI on arm64 would support VGA a valid screen_info structure
is missing.
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Murray <andrew.murray@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 5b4fac434c84..95670a1eafb0 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -351,12 +351,8 @@ void __init setup_arch(char **cmdline_p) #endif #ifdef CONFIG_VT -#if defined(CONFIG_VGA_CONSOLE) - conswitchp = &vga_con; -#elif defined(CONFIG_DUMMY_CONSOLE) conswitchp = &dummy_con; #endif -#endif if (boot_args[1] || boot_args[2] || boot_args[3]) { pr_err("WARNING: x1-x3 nonzero in violation of boot protocol:\n" "\tx1: %016llx\n\tx2: %016llx\n\tx3: %016llx\n" |