Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / net / irda / Kconfig

diff --git a/net/irda/Kconfig b/net/irda/Kconfig
index 9efb17ba48acc9c6995cb72af28af9678dd84210..c8671a7ffb3cd11153fad20d0f6cfc16479b6e1e 100644 (file)
--- a/net/irda/Kconfig
+++ b/net/irda/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menuconfig IRDA
-       depends on NET
+       depends on NET && !S390
        tristate "IrDA (infrared) subsystem support"
        select CRC_CCITT
        ---help---