X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-powerpc.config;h=7f0cfc36185561d793fbc1abe2fdbb0060676dc2;hb=9b3fcbe069e2b3f442cb26a46e780a41df1aa844;hp=bcaab8dbb58da3d5ec662cc44395179dd9a12b68;hpb=61126196bacd835503c2ec2a19800ce86b6cbe32;p=packages%2Fkernel.git

diff --git a/kernel-powerpc.config b/kernel-powerpc.config
index bcaab8db..7f0cfc36 100644
--- a/kernel-powerpc.config
+++ b/kernel-powerpc.config
@@ -21,13 +21,15 @@ HIGHMEM ppc=n
 #- file kernel/Kconfig.preempt goes here
 #- file fs/Kconfig.binfmt goes here
 IOMMU_VMERGE ppc64=n
-HOTPLUG_CPU ppc64=y
+SWIOTLB powerpc=n
+HOTPLUG_CPU powerpc=y
 KEXEC powerpc=y
 CRASH_DUMP powerpc=n
 PHYP_DUMP ppc64=n
 IRQ_ALL_CPUS powerpc=y
 NUMA ppc64=y
 #- file mm/Kconfig goes here
+PPC_4K_PAGES ppc=y ppc64=y
 PPC_64K_PAGES ppc64=n
 FORCE_MAX_ZONEORDER ppc=11 ppc64=13
 SCHED_SMT ppc64=n
@@ -59,9 +61,12 @@ KERNEL_START ppc=0xc0000000
 #- *** FILE: arch/powerpc/Kconfig.debug ***
 #-
 #- file lib/Kconfig.debug goes here
+PPC_DISABLE_WERROR powerpc=y
 PRINT_STACK_DEPTH powerpc=64
 DEBUG_STACKOVERFLOW powerpc=n
 DEBUG_STACK_USAGE powerpc=n
+HCALL_STATS ppc64=n
+PPC_EMULATED_STATS powerpc=n
 CODE_PATCHING_SELFTEST powerpc=n
 FTR_FIXUP_SELFTEST powerpc=n
 MSI_BITMAP_SELFTEST powerpc=n
@@ -135,7 +140,7 @@ PPC_86xx ppc=n
 #- file arch/powerpc/platforms/44x/Kconfig goes here
 #- file arch/powerpc/platforms/40x/Kconfig goes here
 #- file arch/powerpc/platforms/amigaone/Kconfig goes here
-PPC_OF_BOOT_TRAMPOLINE ppc=y
+PPC_OF_BOOT_TRAMPOLINE powerpc=y
 UDBG_RTAS_CONSOLE ppc=n ppc64=y
 PPC_UDBG_BEAT ppc64=y
 RTAS_PROC powerpc=y
@@ -155,11 +160,14 @@ SIMPLE_GPIO powerpc=y
 #- *** FILE: arch/powerpc/platforms/Kconfig.cputype ***
 #-
 PPC64 ppc=n ppc64=y
+PPC_BOOK3S_32 ppc=y
 PPC_85xx ppc=n
 PPC_8xx ppc=n
 40x ppc=n
 44x ppc=n
 E200 ppc=n
+PPC_BOOK3S_64 ppc64=y
+PPC_BOOK3E_64 ppc64=n
 POWER4_ONLY ppc64=n
 6xx ppc=y
 TUNE_CELL ppc64=n
@@ -174,6 +182,7 @@ NR_CPUS ppc=4 ppc64=32
 #-
 PPC_IBM_CELL_BLADE ppc64=y
 PPC_CELLEB ppc64=y
+PPC_CELL_QPACE ppc64=y
 SPU_FS ppc64=m
 SPU_FS_64K_LS ppc64=y
 CBE_RAS ppc64=y
@@ -181,6 +190,7 @@ PPC_IBM_CELL_RESETBUTTON ppc64=y
 PPC_IBM_CELL_POWERBUTTON ppc64=m
 CBE_THERM ppc64=m
 CBE_CPUFREQ ppc64=m
+CBE_CPUFREQ_PMI_ENABLE ppc64=y
 CBE_CPUFREQ_PMI ppc64=m
 PPC_PMI ppc64=m
 CBE_CPUFREQ_SPU_GOVERNOR ppc64=m
@@ -239,6 +249,7 @@ PS3_VUART ppc64=y
 PS3_DISK ppc64=m
 PS3_ROM ppc64=m
 PS3_FLASH ppc64=m
+PS3_VRAM ppc64=m
 PS3_LPM ppc64=m
 
 #-
@@ -259,11 +270,7 @@ PPC_BESTCOMM_FEC ppc=m
 PPC_BESTCOMM_GEN_BD ppc=m
 
 #-
-#- *** FILE: mm/Kconfig.debug ***
+#- *** FILE: drivers/edac/Kconfig ***
 #-
-DEBUG_PAGEALLOC powerpc=n
-
-#-
-#- *** PROBABLY REMOVED OPTIONS ***
-#-
-CC_STACKPROTECTOR powerpc=n
+#- Reporting subsystems
+EDAC_CPC925 ppc64=m