diff --git a/[refs] b/[refs]
index 3f1ad53bd8cc..e375c4d7b36b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8717a3d66ad697158f7a0dd6045fec280c8d723
+refs/heads/master: 1150f25441a7dad818fa4366d01c45c2fef1cbe8
diff --git a/trunk/arch/s390/include/asm/vga.h b/trunk/arch/s390/include/asm/vga.h
new file mode 100644
index 000000000000..d375526c261f
--- /dev/null
+++ b/trunk/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/trunk/drivers/gpu/vga/Kconfig b/trunk/drivers/gpu/vga/Kconfig
index f34838839b08..29437eabe095 100644
--- a/trunk/drivers/gpu/vga/Kconfig
+++ b/trunk/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