Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[karo-tx-linux.git] / drivers / parport / Kconfig

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 0e60438ebe30ebc5a301feaf8da02e589cbfcc96..24e12d4d17699ab41601676ccb1f342b9cfdbc87 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -35,7 +35,7 @@ if PARPORT
 
 config PARPORT_PC
        tristate "PC-style hardware"
-       depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && \
+       depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \
                (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && !XTENSA
        ---help---
          You should say Y here if you have a PC-style parallel port. All