projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
[firefly-linux-kernel-4.4.55.git]
/
net
/
Kconfig
diff --git
a/net/Kconfig
b/net/Kconfig
index 041c35edb763dd96b266f89b8080cb694a87bbf4..0d68b40fc0e625d79aece260f08952c1ac374987 100644
(file)
--- a/
net/Kconfig
+++ b/
net/Kconfig
@@
-186,6
+186,7
@@
source "net/sctp/Kconfig"
source "net/rds/Kconfig"
source "net/tipc/Kconfig"
source "net/atm/Kconfig"
source "net/rds/Kconfig"
source "net/tipc/Kconfig"
source "net/atm/Kconfig"
+source "net/l2tp/Kconfig"
source "net/802/Kconfig"
source "net/bridge/Kconfig"
source "net/dsa/Kconfig"
source "net/802/Kconfig"
source "net/bridge/Kconfig"
source "net/dsa/Kconfig"
@@
-203,6
+204,11
@@
source "net/ieee802154/Kconfig"
source "net/sched/Kconfig"
source "net/dcb/Kconfig"
source "net/sched/Kconfig"
source "net/dcb/Kconfig"
+config RPS
+ boolean
+ depends on SMP && SYSFS
+ default y
+
menu "Network testing"
config NET_PKTGEN
menu "Network testing"
config NET_PKTGEN
@@
-275,5
+281,7
@@
source "net/wimax/Kconfig"
source "net/rfkill/Kconfig"
source "net/9p/Kconfig"
source "net/rfkill/Kconfig"
source "net/9p/Kconfig"
+source "net/caif/Kconfig"
+
endif # if NET
endif # if NET