diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /arch/powerpc/configs/celleb_defconfig | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/powerpc/configs/celleb_defconfig')
| -rw-r--r-- | arch/powerpc/configs/celleb_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig index d2123779512a..6be6c09eba6d 100644 --- a/arch/powerpc/configs/celleb_defconfig +++ b/arch/powerpc/configs/celleb_defconfig | |||
| @@ -78,8 +78,7 @@ CONFIG_LOG_BUF_SHIFT=15 | |||
| 78 | # CONFIG_GROUP_SCHED is not set | 78 | # CONFIG_GROUP_SCHED is not set |
| 79 | # CONFIG_USER_SCHED is not set | 79 | # CONFIG_USER_SCHED is not set |
| 80 | # CONFIG_CGROUP_SCHED is not set | 80 | # CONFIG_CGROUP_SCHED is not set |
| 81 | CONFIG_SYSFS_DEPRECATED=y | 81 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 82 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 83 | # CONFIG_RELAY is not set | 82 | # CONFIG_RELAY is not set |
| 84 | CONFIG_NAMESPACES=y | 83 | CONFIG_NAMESPACES=y |
| 85 | # CONFIG_UTS_NS is not set | 84 | # CONFIG_UTS_NS is not set |