diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-10-14 11:57:29 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-10-14 11:57:29 -0400 |
commit | ce0ecc8abfa9904e27a5f3ac4dd83398b134278d (patch) | |
tree | 031363a799c1869889c961fcc49715896f59f703 /net/Kconfig | |
parent | de5bbad6770882209b0ac58b0ba9259a98cfb953 (diff) | |
parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) |
Merge branch 'master' into for-linus
Diffstat (limited to 'net/Kconfig')
-rw-r--r-- | net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Kconfig b/net/Kconfig index e330594d3709..e926884c1675 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -217,7 +217,7 @@ source "net/dns_resolver/Kconfig" | |||
217 | 217 | ||
218 | config RPS | 218 | config RPS |
219 | boolean | 219 | boolean |
220 | depends on SMP && SYSFS | 220 | depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS |
221 | default y | 221 | default y |
222 | 222 | ||
223 | menu "Network testing" | 223 | menu "Network testing" |