diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 03:01:02 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 03:01:02 +0400 |
commit | ecdca043ebe8e3172e0400d0966831e2e60870a0 (patch) | |
tree | c1433e2399f544970e1f9ae7a469dbc9172c8e9f /drivers/isdn/Kconfig | |
parent | bb3215e97bb1ab917ed858322a9399fb32e69e49 (diff) | |
parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
download | linux-ecdca043ebe8e3172e0400d0966831e2e60870a0.tar.xz |
Merge 3.7-rc5 into driver-core-next
Diffstat (limited to 'drivers/isdn/Kconfig')
-rw-r--r-- | drivers/isdn/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index a233ed53913a..86cd75a0e84d 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -4,7 +4,7 @@ menuconfig ISDN bool "ISDN support" - depends on NET + depends on NET && NETDEVICES depends on !S390 && !UML ---help--- ISDN ("Integrated Services Digital Network", called RNIS in France) |