Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mv-sheeva.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 5e203b55870387980a316c7d69b4c388f67c12d0..72840626284bc74b4fcd3d6564781ff909fae75f 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -214,12 +214,18 @@ 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
        depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
        default y
 
+config XPS
+       boolean
+       depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
+       default y
+
 menu "Network testing"
 
 config NET_PKTGEN