diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
| commit | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (patch) | |
| tree | a9e7f0563cef296b24c53b20dbb388ec5c210172 /arch/powerpc/configs/pasemi_defconfig | |
| parent | 1c14e6cecb1811543b1016f27e5d308fbea8c08a (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/powerpc/configs/pasemi_defconfig')
| -rw-r--r-- | arch/powerpc/configs/pasemi_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 20ba0cfff8ba..74a7216183e8 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_defconfig | |||
| @@ -98,8 +98,7 @@ CONFIG_RCU_FANOUT=64 | |||
| 98 | CONFIG_LOG_BUF_SHIFT=17 | 98 | CONFIG_LOG_BUF_SHIFT=17 |
| 99 | # CONFIG_GROUP_SCHED is not set | 99 | # CONFIG_GROUP_SCHED is not set |
| 100 | # CONFIG_CGROUPS is not set | 100 | # CONFIG_CGROUPS is not set |
| 101 | CONFIG_SYSFS_DEPRECATED=y | 101 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 102 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 103 | # CONFIG_RELAY is not set | 102 | # CONFIG_RELAY is not set |
| 104 | CONFIG_NAMESPACES=y | 103 | CONFIG_NAMESPACES=y |
| 105 | # CONFIG_UTS_NS is not set | 104 | # CONFIG_UTS_NS is not set |