Merge commit 'origin/master' into next

[pandora-kernel.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index c19f549..7051b97 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -179,6 +179,7 @@ source "net/lapb/Kconfig"
 source "net/econet/Kconfig"
 source "net/wanrouter/Kconfig"
 source "net/phonet/Kconfig"
+source "net/ieee802154/Kconfig"
 source "net/sched/Kconfig"
 source "net/dcb/Kconfig"