Browse Source

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>
Jan Glauber 12 years ago
parent
commit
1150f25441
2 changed files with 7 additions and 1 deletions
  1. 6 0
      arch/s390/include/asm/vga.h
  2. 1 1
      drivers/gpu/vga/Kconfig

+ 6 - 0
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 */

+ 1 - 1
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