diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
| commit | 8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c (patch) | |
| tree | 2478e1708f5a3da261597f4aa1011d4d41c2cc84 /arch/powerpc/configs/mpc86xx_defconfig | |
| parent | bca606a646a2b1f4fa1ae2b22a0ac707505d7297 (diff) | |
| parent | 5e152b4c9e0fce6149c74406346a7ae7e7a17727 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'arch/powerpc/configs/mpc86xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc86xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig index 038a308cbfc4..a1cc8179e9fd 100644 --- a/arch/powerpc/configs/mpc86xx_defconfig +++ b/arch/powerpc/configs/mpc86xx_defconfig | |||
| @@ -171,7 +171,6 @@ CONFIG_MAC_PARTITION=y | |||
| 171 | CONFIG_CRC_T10DIF=y | 171 | CONFIG_CRC_T10DIF=y |
| 172 | CONFIG_DEBUG_KERNEL=y | 172 | CONFIG_DEBUG_KERNEL=y |
| 173 | CONFIG_DETECT_HUNG_TASK=y | 173 | CONFIG_DETECT_HUNG_TASK=y |
| 174 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 175 | CONFIG_DEBUG_INFO=y | 174 | CONFIG_DEBUG_INFO=y |
| 176 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 175 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 177 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 176 | CONFIG_SYSCTL_SYSCALL_CHECK=y |