diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-09 11:40:48 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-09 11:40:48 -0600 |
| commit | b8583f6872496cdb0145a2f642fbefff002d68cb (patch) | |
| tree | 172dba46240de92865e6a8605cbb5736d2b113aa /arch/powerpc/configs/mpc834x_mds_defconfig | |
| parent | 8f34f6cfa27ddae8faf10aef986db2fda1ba6791 (diff) | |
| parent | 49baa91d6863df480fa05eb57524a274f77fa886 (diff) | |
| download | kernel-crypto-b8583f6872496cdb0145a2f642fbefff002d68cb.tar.gz kernel-crypto-b8583f6872496cdb0145a2f642fbefff002d68cb.tar.xz kernel-crypto-b8583f6872496cdb0145a2f642fbefff002d68cb.zip | |
Merge branch '83xx' into for_paulus
Diffstat (limited to 'arch/powerpc/configs/mpc834x_mds_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc834x_mds_defconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig index 9eaed3a3698..2e3f8efb6ab 100644 --- a/arch/powerpc/configs/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/mpc834x_mds_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc5 -# Fri Jan 26 00:19:27 2007 +# Linux kernel version: 2.6.20 +# Thu Feb 8 01:00:48 2007 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y CONFIG_PPC_83xx=y # CONFIG_PPC_85xx is not set # CONFIG_PPC_86xx is not set +# CONFIG_PPC_8xx is not set # CONFIG_40x is not set # CONFIG_44x is not set -# CONFIG_8xx is not set # CONFIG_E200 is not set CONFIG_6xx=y CONFIG_83xx=y @@ -128,8 +128,9 @@ CONFIG_PPC_GEN550=y # # Platform support # +# CONFIG_MPC8313_RDB is not set # CONFIG_MPC832x_MDS is not set -CONFIG_MPC834x_SYS=y +CONFIG_MPC834x_MDS=y # CONFIG_MPC834x_ITX is not set # CONFIG_MPC8360E_PB is not set CONFIG_MPC834x=y |