diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:24 -0400 |
| commit | f384c954c9fe3d3c6fce5ae66b67f2ddd947d098 (patch) | |
| tree | a38541b8083a2304435e9a153d408bd7cd44116e /arch/powerpc/configs/ppc40x_defconfig | |
| parent | 9a15a07fe2175dc25cd928a354b3839f562ac8cc (diff) | |
| parent | 5904b3b81d25166e5e39b9727645bb47937618e3 (diff) | |
Merge branch 'linus' into perf/core
Reason: Further changes conflict with upstream fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/powerpc/configs/ppc40x_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc40x_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig index 35b60683cde5..afb4d1bb2ba9 100644 --- a/arch/powerpc/configs/ppc40x_defconfig +++ b/arch/powerpc/configs/ppc40x_defconfig | |||
| @@ -99,8 +99,7 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
| 99 | CONFIG_USER_SCHED=y | 99 | CONFIG_USER_SCHED=y |
| 100 | # CONFIG_CGROUP_SCHED is not set | 100 | # CONFIG_CGROUP_SCHED is not set |
| 101 | # CONFIG_CGROUPS is not set | 101 | # CONFIG_CGROUPS is not set |
| 102 | CONFIG_SYSFS_DEPRECATED=y | 102 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 103 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 104 | # CONFIG_RELAY is not set | 103 | # CONFIG_RELAY is not set |
| 105 | # CONFIG_NAMESPACES is not set | 104 | # CONFIG_NAMESPACES is not set |
| 106 | CONFIG_BLK_DEV_INITRD=y | 105 | CONFIG_BLK_DEV_INITRD=y |