diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-15 14:01:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-15 14:01:58 +1000 |
| commit | 57bd61c2c39179e91e3ad72e20d79dee0d7121bf (patch) | |
| tree | ffe6b6987e211f52d655a5ce99e15403d3c29df1 /net | |
| parent | 8a5090cbfff95eb20499013e1e297fbe8a30b4d6 (diff) | |
| parent | f97d62f504228bbd4039c9b50118dbd6f7f3d30d (diff) | |
Merge remote branch 'bkl-config/config'
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipx/Kconfig | 1 | ||||
| -rw-r--r-- | net/irda/Kconfig | 1 | ||||
| -rw-r--r-- | net/irda/irnet/Kconfig | 1 | ||||
| -rw-r--r-- | net/x25/Kconfig | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/net/ipx/Kconfig b/net/ipx/Kconfig index e9ad0062fbb6..02549cb2c328 100644 --- a/net/ipx/Kconfig +++ b/net/ipx/Kconfig @@ -3,6 +3,7 @@ # config IPX tristate "The IPX protocol" + depends on BKL # should be fixable select LLC ---help--- This is support for the Novell networking protocol, IPX, commonly diff --git a/net/irda/Kconfig b/net/irda/Kconfig index c8671a7ffb3c..073243f8177b 100644 --- a/net/irda/Kconfig +++ b/net/irda/Kconfig @@ -4,6 +4,7 @@ menuconfig IRDA depends on NET && !S390 + depends on BKL # should be fixable tristate "IrDA (infrared) subsystem support" select CRC_CCITT ---help--- diff --git a/net/irda/irnet/Kconfig b/net/irda/irnet/Kconfig index 28c557f0fdd2..b1e68c1f483b 100644 --- a/net/irda/irnet/Kconfig +++ b/net/irda/irnet/Kconfig @@ -1,6 +1,7 @@ config IRNET tristate "IrNET protocol" depends on IRDA && PPP + depends on BKL # might need to lock against AF_IRDA help Say Y here if you want to build support for the IrNET protocol. To compile it as a module, choose M here: the module will be diff --git a/net/x25/Kconfig b/net/x25/Kconfig index e6759c9660bb..2196e55e4f61 100644 --- a/net/x25/Kconfig +++ b/net/x25/Kconfig @@ -5,6 +5,7 @@ config X25 tristate "CCITT X.25 Packet Layer (EXPERIMENTAL)" depends on EXPERIMENTAL + depends on BKL # should be fixable ---help--- X.25 is a set of standardized network protocols, similar in scope to frame relay; the one physical line from your box to the X.25 network |