diff --git a/[refs] b/[refs]
index b874cb1c4338..2bfec98ffca1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0383a68cd2583ef3693cbfffe5abfc4369d70d46
+refs/heads/master: 075aa0c6b1e33ff953dfd66bdc7d187011f563c0
diff --git a/trunk/drivers/parport/Kconfig b/trunk/drivers/parport/Kconfig
index 0e60438ebe30..24e12d4d1769 100644
--- a/trunk/drivers/parport/Kconfig
+++ b/trunk/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