Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[~andy/linux] / net / ieee802154 / Kconfig

diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
index b2e06df0076c85ea09b58187d468b8307cd03ede..9c9879d5ea64e7e3e6fe04e1de3675d3ed3c256c 100644 (file)
--- a/net/ieee802154/Kconfig
+++ b/net/ieee802154/Kconfig
@@ -13,5 +13,12 @@ config IEEE802154
 config IEEE802154_6LOWPAN
        tristate "6lowpan support over IEEE 802.15.4"
        depends on IEEE802154 && IPV6
+       select 6LOWPAN_IPHC
        ---help---
        IPv6 compression over IEEE 802.15.4.
+
+config 6LOWPAN_IPHC
+       tristate
+       ---help---
+         6lowpan compression code which is shared between IEEE 802.15.4 and Bluetooth
+         stacks.