diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 03:56:13 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 03:56:13 +0100 |
commit | 795ad0819be4d5922b5140bdda6ff9d0368b0512 (patch) | |
tree | e96992a37b3ebc611b7de7a745f28237ecf7a365 /net/Kconfig | |
parent | 549367162dfdc75d573f74f4e2891f2dba41582f (diff) | |
download | kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.zip kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.tar.gz kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.tar.bz2 |
first merge of networking with upstream
Diffstat (limited to 'net/Kconfig')
-rw-r--r-- | net/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/Kconfig b/net/Kconfig index b74076a..2d583ad 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -231,7 +231,7 @@ source "net/dns_resolver/Kconfig" source "net/batman-adv/Kconfig" config RPS - boolean "RPS" + boolean depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS default y @@ -314,7 +314,6 @@ source "net/can/Kconfig" source "net/irda/Kconfig" source "net/bluetooth/Kconfig" source "net/bluetooth_mgmt/Kconfig" -source "net/bluetooth_tizen/Kconfig" source "net/rxrpc/Kconfig" config FIB_RULES |