Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / drivers / gpu / vga / Kconfig

diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index f34838839b08c1f6f2eb64b8fde03265a9a96ef3..29437eabe0957d67893808ed7d668f54770c3fd7 100644 (file)
--- 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