diff options
author | Robert Richter <robert.richter@amd.com> | 2010-10-11 17:26:50 (GMT) |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2010-10-11 17:26:50 (GMT) |
commit | ad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5 (patch) | |
tree | 2565121e4b9945d953e02c77a2e53065b3789aa4 /net/Kconfig | |
parent | 86c8c04792f152c5469023885510140dd34817bc (diff) | |
parent | c7a27aa4652c63172489a73f3961455650a79a7f (diff) | |
download | linux-ad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5.tar.xz |
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
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 e330594..e926884 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -217,7 +217,7 @@ source "net/dns_resolver/Kconfig" config RPS boolean - depends on SMP && SYSFS + depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS default y menu "Network testing" |