diff options
| author | Jan Glauber <jang@linux.vnet.ibm.com> | 2012-11-29 14:40:40 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-11-30 17:47:28 +0100 |
| commit | 1150f25441a7dad818fa4366d01c45c2fef1cbe8 (patch) | |
| tree | cac2b7f464f57f8bc04fabd467e23d5d0aa0f117 | |
| parent | c8717a3d66ad697158f7a0dd6045fec280c8d723 (diff) | |
| download | linux-1150f25441a7dad818fa4366d01c45c2fef1cbe8.tar.bz2 | |
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>
| -rw-r--r-- | arch/s390/include/asm/vga.h | 6 | ||||
| -rw-r--r-- | drivers/gpu/vga/Kconfig | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/s390/include/asm/vga.h b/arch/s390/include/asm/vga.h new file mode 100644 index 000000000000..d375526c261f --- /dev/null +++ b/arch/s390/include/asm/vga.h @@ -0,0 +1,6 @@ +#ifndef _ASM_S390_VGA_H +#define _ASM_S390_VGA_H + +/* Avoid compile errors due to missing asm/vga.h */ + +#endif /* _ASM_S390_VGA_H */ diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index f34838839b08..29437eabe095 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -1,7 +1,7 @@ config VGA_ARB bool "VGA Arbitration" if EXPERT default y - depends on PCI + depends on (PCI && !S390) help Some "legacy" VGA devices implemented on PCI typically have the same hard-decoded addresses as they did on ISA. When multiple PCI devices |