diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-19 13:04:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-19 13:04:47 -0400 |
| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 (patch) | |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
Diffstat (limited to 'arch/powerpc/configs/83xx/mpc8313_rdb_defconfig')
| -rw-r--r-- | arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 2028337868b4..b7eae2bdf19c 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |||
| @@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y | |||
| 163 | # | 163 | # |
| 164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
| 165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
| 166 | CONFIG_PPC_CHRP=y | 166 | # CONFIG_PPC_CHRP is not set |
| 167 | # CONFIG_PPC_PMAC is not set | ||
| 167 | # CONFIG_MPC5121_ADS is not set | 168 | # CONFIG_MPC5121_ADS is not set |
| 168 | # CONFIG_MPC5121_GENERIC is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
| 169 | # CONFIG_PPC_MPC52xx is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
| 170 | CONFIG_PPC_PMAC=y | ||
| 171 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
| 172 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
| 173 | # CONFIG_PPC_82xx is not set | 173 | # CONFIG_PPC_82xx is not set |