diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-06-26 14:19:35 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-06-26 14:38:47 +1000 |
| commit | ca74c013441200b162f6a384b23b833d1865a9e8 (patch) | |
| tree | 7bfb0137f347ee3850e9db78d4f5fc08cc7a93fe /arch/powerpc/configs/g5_defconfig | |
| parent | d30d6badd1769a00bc5a800b8af4e8b3f169c633 (diff) | |
| download | blackbird-op-linux-ca74c013441200b162f6a384b23b833d1865a9e8.tar.gz blackbird-op-linux-ca74c013441200b162f6a384b23b833d1865a9e8.zip | |
[POWERPC] Update defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/configs/g5_defconfig')
| -rw-r--r-- | arch/powerpc/configs/g5_defconfig | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 1517852afe02..a217f4ebcf71 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig @@ -1,22 +1,9 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.22-rc4 -# Fri Jun 22 08:45:59 2007 +# Linux kernel version: 2.6.22-rc6 +# Tue Jun 26 12:38:34 2007 # CONFIG_PPC64=y - -# -# Processor support -# -CONFIG_POWER4_ONLY=y -CONFIG_POWER4=y -CONFIG_PPC_FPU=y -CONFIG_ALTIVEC=y -CONFIG_PPC_STD_MMU=y -CONFIG_PPC_MM_SLICES=y -CONFIG_VIRT_CPU_ACCOUNTING=y -CONFIG_SMP=y -CONFIG_NR_CPUS=4 CONFIG_64BIT=y CONFIG_PPC_MERGE=y CONFIG_MMU=y @@ -41,9 +28,22 @@ CONFIG_AUDIT_ARCH=y CONFIG_GENERIC_BUG=y # CONFIG_DEFAULT_UIMAGE is not set CONFIG_PPC64_SWSUSP=y + +# +# Processor support +# +CONFIG_POWER4_ONLY=y +CONFIG_POWER4=y +CONFIG_PPC_FPU=y # CONFIG_PPC_DCR_NATIVE is not set # CONFIG_PPC_DCR_MMIO is not set # CONFIG_PPC_OF_PLATFORM_PCI is not set +CONFIG_ALTIVEC=y +CONFIG_PPC_STD_MMU=y +CONFIG_PPC_MM_SLICES=y +CONFIG_VIRT_CPU_ACCOUNTING=y +CONFIG_SMP=y +CONFIG_NR_CPUS=4 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # @@ -137,6 +137,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_PPC_MULTIPLATFORM=y # CONFIG_EMBEDDED6xx is not set +# CONFIG_APUS is not set # CONFIG_PPC_PSERIES is not set # CONFIG_PPC_ISERIES is not set # CONFIG_PPC_MPC52xx is not set |
