diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /arch/powerpc/configs/mpc85xx_defconfig | |
| parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
| parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index ada595898af1..ee6acc6557f8 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -203,6 +203,7 @@ CONFIG_MPC85xx_CDS=y | |||
| 203 | CONFIG_MPC85xx_MDS=y | 203 | CONFIG_MPC85xx_MDS=y |
| 204 | CONFIG_MPC8536_DS=y | 204 | CONFIG_MPC8536_DS=y |
| 205 | CONFIG_MPC85xx_DS=y | 205 | CONFIG_MPC85xx_DS=y |
| 206 | CONFIG_MPC85xx_RDB=y | ||
| 206 | CONFIG_SOCRATES=y | 207 | CONFIG_SOCRATES=y |
| 207 | CONFIG_KSI8560=y | 208 | CONFIG_KSI8560=y |
| 208 | # CONFIG_XES_MPC85xx is not set | 209 | # CONFIG_XES_MPC85xx is not set |