diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /net/Kconfig | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/Kconfig b/net/Kconfig index d334678..b50dacc 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -220,11 +220,10 @@ source "net/openvswitch/Kconfig" source "net/vmw_vsock/Kconfig" source "net/netlink/Kconfig" source "net/mpls/Kconfig" -source "net/hsr/Kconfig" config RPS boolean - depends on SMP && SYSFS + depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS default y config RFS_ACCEL @@ -235,7 +234,7 @@ config RFS_ACCEL config XPS boolean - depends on SMP + depends on SMP && USE_GENERIC_SMP_HELPERS default y config NETPRIO_CGROUP |