tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

vga: compile fix, disable vga for s390

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Jan Glauber and committed by
Martin Schwidefsky 1150f254 c8717a3d

+7 -1
+6
arch/s390/include/asm/vga.h
··· 1 + #ifndef _ASM_S390_VGA_H 2 + #define _ASM_S390_VGA_H 3 + 4 + /* Avoid compile errors due to missing asm/vga.h */ 5 + 6 + #endif /* _ASM_S390_VGA_H */
+1 -1
drivers/gpu/vga/Kconfig
··· 1 1 config VGA_ARB 2 2 bool "VGA Arbitration" if EXPERT 3 3 default y 4 - depends on PCI 4 + depends on (PCI && !S390) 5 5 help 6 6 Some "legacy" VGA devices implemented on PCI typically have the same 7 7 hard-decoded addresses as they did on ISA. When multiple PCI devices