diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-03-13 11:31:41 +0100 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-03-13 07:05:10 -0700 |
| commit | 52d3ef5c2537d1b892d5fefff754b995394d7be3 (patch) | |
| tree | 9a844f680dd26a1d4dadb75c34d9367c62b2b8c0 /net/bluetooth | |
| parent | Bluetooth: Convert uses of __constant_<foo> to <foo> (diff) | |
| download | linux-dev-52d3ef5c2537d1b892d5fefff754b995394d7be3.tar.xz linux-dev-52d3ef5c2537d1b892d5fefff754b995394d7be3.zip | |
Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed
Commit 975508879 "Bluetooth: make bluetooth 6lowpan as an option"
ensures that 6LOWPAN_IPHC is turned on when we have BT_6LOWPAN
enabled in Kconfig, but it allows building the IPHC code as
a loadable module even if the entire Bluetooth stack is built-in,
and that causes a link error.
We can solve that by moving the 'select' statement into CONFIG_BT,
which is a "tristate" option to enforce that 6LOWPAN_IPHC can
only be a module if BT also is a module.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig index 10c752f18feb..06ec14499ca1 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -6,6 +6,7 @@ menuconfig BT tristate "Bluetooth subsystem support" depends on NET && !S390 depends on RFKILL || !RFKILL + select 6LOWPAN_IPHC if BT_6LOWPAN select CRC16 select CRYPTO select CRYPTO_BLKCIPHER @@ -42,7 +43,6 @@ menuconfig BT config BT_6LOWPAN bool "Bluetooth 6LoWPAN support" depends on BT && IPV6 - select 6LOWPAN_IPHC help IPv6 compression over Bluetooth. |