Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638

[linux-2.6-microblaze.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 126c2af..ad0aafe 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -214,6 +214,7 @@ source "net/ieee802154/Kconfig"
 source "net/sched/Kconfig"
 source "net/dcb/Kconfig"
 source "net/dns_resolver/Kconfig"
+source "net/batman-adv/Kconfig"
 
 config RPS
        boolean