diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-24 02:08:33 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-24 02:08:33 +0200 |
| commit | f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0 (patch) | |
| tree | d1b649e6f97ac0f1fc9864a296021c71cf69cd21 /net/Kconfig | |
| parent | 272e77de798362c31e6452a46a0e7d5b6aaeb550 (diff) | |
| download | kernel_samsung_smdk4412-f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0.zip kernel_samsung_smdk4412-f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0.tar.gz kernel_samsung_smdk4412-f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0.tar.bz2 | |
update network codemigrate_3.2
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/Kconfig b/net/Kconfig index b74076a..c0a7305 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 @@ -264,7 +264,7 @@ menu "Network testing" config NET_PKTGEN tristate "Packet Generator (USE WITH CAUTION)" - depends on PROC_FS + depends on INET && PROC_FS ---help--- This module will inject preconfigured packets, at a configurable rate, out of a given interface. It is used for network interface @@ -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 @@ -338,6 +337,7 @@ source "net/rfkill/Kconfig" source "net/9p/Kconfig" source "net/caif/Kconfig" source "net/ceph/Kconfig" +source "net/nfc/Kconfig" endif # if NET |