diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-21 15:45:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-21 15:45:08 -0400 |
| commit | dca45ad8af54963c005393a484ad117b8ba6150f (patch) | |
| tree | 7c9a6966283a6bb12b54e5680a67d203be292930 /arch/powerpc/configs/ppc64e_defconfig | |
| parent | 68c38fc3cb4e5a60f502ee9c45f3dfe70e5165ad (diff) | |
| parent | cd5b8f8755a89a57fc8c408d284b8b613f090345 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: Move from the -rc3 to the almost-rc6 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/configs/ppc64e_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64e_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig index 8195f1650cbf..403e82e2e83c 100644 --- a/arch/powerpc/configs/ppc64e_defconfig +++ b/arch/powerpc/configs/ppc64e_defconfig | |||
| @@ -107,8 +107,7 @@ CONFIG_CPUSETS=y | |||
| 107 | CONFIG_PROC_PID_CPUSET=y | 107 | CONFIG_PROC_PID_CPUSET=y |
| 108 | # CONFIG_CGROUP_CPUACCT is not set | 108 | # CONFIG_CGROUP_CPUACCT is not set |
| 109 | # CONFIG_RESOURCE_COUNTERS is not set | 109 | # CONFIG_RESOURCE_COUNTERS is not set |
| 110 | CONFIG_SYSFS_DEPRECATED=y | 110 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 111 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 112 | CONFIG_RELAY=y | 111 | CONFIG_RELAY=y |
| 113 | CONFIG_NAMESPACES=y | 112 | CONFIG_NAMESPACES=y |
| 114 | # CONFIG_UTS_NS is not set | 113 | # CONFIG_UTS_NS is not set |