aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-23 03:31:06 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-23 03:31:06 -0500
commit51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch)
tree9f54936c87764bef75e97395cb56b7d1e0df24c6 /arch/powerpc
parent4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff)
parent6be325719b3e54624397e413efd4b33a997e55a3 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/powerpc')
-rwxr-xr-xarch/powerpc/boot/wrapper7
-rw-r--r--arch/powerpc/configs/52xx/cm5200_defconfig75
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig90
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig79
-rw-r--r--arch/powerpc/configs/52xx/pcm030_defconfig83
-rw-r--r--arch/powerpc/configs/52xx/tqm5200_defconfig79
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig88
-rw-r--r--arch/powerpc/configs/83xx/kmeter1_defconfig68
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig97
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig100
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig89
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig93
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig95
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig92
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig86
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig89
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig87
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig89
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig91
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig85
-rw-r--r--arch/powerpc/configs/85xx/ksi8560_defconfig69
-rw-r--r--arch/powerpc/configs/85xx/mpc8540_ads_defconfig69
-rw-r--r--arch/powerpc/configs/85xx/mpc8560_ads_defconfig76
-rw-r--r--arch/powerpc/configs/85xx/mpc85xx_cds_defconfig75
-rw-r--r--arch/powerpc/configs/85xx/sbc8548_defconfig77
-rw-r--r--arch/powerpc/configs/85xx/sbc8560_defconfig72
-rw-r--r--arch/powerpc/configs/85xx/socrates_defconfig99
-rw-r--r--arch/powerpc/configs/85xx/stx_gp3_defconfig87
-rw-r--r--arch/powerpc/configs/85xx/tqm8540_defconfig89
-rw-r--r--arch/powerpc/configs/85xx/tqm8541_defconfig90
-rw-r--r--arch/powerpc/configs/85xx/tqm8548_defconfig95
-rw-r--r--arch/powerpc/configs/85xx/tqm8555_defconfig90
-rw-r--r--arch/powerpc/configs/85xx/tqm8560_defconfig90
-rw-r--r--arch/powerpc/configs/85xx/xes_mpc85xx_defconfig103
-rw-r--r--arch/powerpc/configs/86xx/gef_ppc9a_defconfig102
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc310_defconfig99
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig92
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig88
-rw-r--r--arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig90
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig81
-rw-r--r--arch/powerpc/configs/adder875_defconfig57
-rw-r--r--arch/powerpc/configs/c2k_defconfig90
-rw-r--r--arch/powerpc/configs/ep8248e_defconfig64
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig55
-rw-r--r--arch/powerpc/configs/linkstation_defconfig96
-rw-r--r--arch/powerpc/configs/mgcoge_defconfig74
-rw-r--r--arch/powerpc/configs/mgsuvd_defconfig63
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig106
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig79
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig70
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig92
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig97
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig97
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig65
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig93
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig55
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig72
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig94
-rw-r--r--arch/powerpc/configs/storcenter_defconfig86
-rw-r--r--arch/powerpc/include/asm/topology.h4
-rw-r--r--arch/powerpc/kernel/head_8xx.S12
-rw-r--r--arch/powerpc/kernel/pci-common.c13
-rw-r--r--arch/powerpc/kernel/rtas-proc.c14
-rw-r--r--arch/powerpc/kernel/smp.c12
-rw-r--r--arch/powerpc/kernel/swsusp_32.S2
-rw-r--r--arch/powerpc/kernel/time.c11
-rw-r--r--arch/powerpc/kvm/book3s_64_mmu.c22
-rw-r--r--arch/powerpc/mm/mmap_64.c4
-rw-r--r--arch/powerpc/platforms/cell/spufs/coredump.c2
-rw-r--r--arch/powerpc/platforms/iseries/vio.c2
-rw-r--r--arch/powerpc/platforms/pseries/dlpar.c18
-rw-r--r--arch/powerpc/platforms/pseries/xics.c12
72 files changed, 3856 insertions, 1172 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 390512ae7f86..f4594ed09a20 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -43,6 +43,9 @@ gzip=.gz
43# cross-compilation prefix 43# cross-compilation prefix
44CROSS= 44CROSS=
45 45
46# mkimage wrapper script
47MKIMAGE=$srctree/scripts/mkuboot.sh
48
46# directory for object and other files used by this script 49# directory for object and other files used by this script
47object=arch/powerpc/boot 50object=arch/powerpc/boot
48objbin=$object 51objbin=$object
@@ -267,7 +270,7 @@ membase=`${CROSS}objdump -p "$kernel" | grep -m 1 LOAD | awk '{print $7}'`
267case "$platform" in 270case "$platform" in
268uboot) 271uboot)
269 rm -f "$ofile" 272 rm -f "$ofile"
270 mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \ 273 ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
271 $uboot_version -d "$vmz" "$ofile" 274 $uboot_version -d "$vmz" "$ofile"
272 if [ -z "$cacheit" ]; then 275 if [ -z "$cacheit" ]; then
273 rm -f "$vmz" 276 rm -f "$vmz"
@@ -327,7 +330,7 @@ coff)
327 ;; 330 ;;
328cuboot*) 331cuboot*)
329 gzip -f -9 "$ofile" 332 gzip -f -9 "$ofile"
330 mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \ 333 ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
331 $uboot_version -d "$ofile".gz "$ofile" 334 $uboot_version -d "$ofile".gz "$ofile"
332 ;; 335 ;;
333treeboot*) 336treeboot*)
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig
index 0396ce7bffc6..ff9bdb28197d 100644
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:22 2009 4# Wed Dec 30 14:45:07 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -166,14 +169,41 @@ CONFIG_LBDAF=y
166# IO Schedulers 169# IO Schedulers
167# 170#
168CONFIG_IOSCHED_NOOP=y 171CONFIG_IOSCHED_NOOP=y
169CONFIG_IOSCHED_AS=y
170CONFIG_IOSCHED_DEADLINE=y 172CONFIG_IOSCHED_DEADLINE=y
171CONFIG_IOSCHED_CFQ=y 173CONFIG_IOSCHED_CFQ=y
172CONFIG_DEFAULT_AS=y
173# CONFIG_DEFAULT_DEADLINE is not set 174# CONFIG_DEFAULT_DEADLINE is not set
174# CONFIG_DEFAULT_CFQ is not set 175CONFIG_DEFAULT_CFQ=y
175# CONFIG_DEFAULT_NOOP is not set 176# CONFIG_DEFAULT_NOOP is not set
176CONFIG_DEFAULT_IOSCHED="anticipatory" 177CONFIG_DEFAULT_IOSCHED="cfq"
178# CONFIG_INLINE_SPIN_TRYLOCK is not set
179# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
180# CONFIG_INLINE_SPIN_LOCK is not set
181# CONFIG_INLINE_SPIN_LOCK_BH is not set
182# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
184CONFIG_INLINE_SPIN_UNLOCK=y
185# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
186CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
187# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
188# CONFIG_INLINE_READ_TRYLOCK is not set
189# CONFIG_INLINE_READ_LOCK is not set
190# CONFIG_INLINE_READ_LOCK_BH is not set
191# CONFIG_INLINE_READ_LOCK_IRQ is not set
192# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
193CONFIG_INLINE_READ_UNLOCK=y
194# CONFIG_INLINE_READ_UNLOCK_BH is not set
195CONFIG_INLINE_READ_UNLOCK_IRQ=y
196# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_WRITE_TRYLOCK is not set
198# CONFIG_INLINE_WRITE_LOCK is not set
199# CONFIG_INLINE_WRITE_LOCK_BH is not set
200# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
202CONFIG_INLINE_WRITE_UNLOCK=y
203# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
204CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
205# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
206# CONFIG_MUTEX_SPIN_ON_OWNER is not set
177# CONFIG_FREEZER is not set 207# CONFIG_FREEZER is not set
178 208
179# 209#
@@ -189,6 +219,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
189# CONFIG_PPC_MEDIA5200 is not set 219# CONFIG_PPC_MEDIA5200 is not set
190# CONFIG_PPC_MPC5200_BUGFIX is not set 220# CONFIG_PPC_MPC5200_BUGFIX is not set
191# CONFIG_PPC_MPC5200_GPIO is not set 221# CONFIG_PPC_MPC5200_GPIO is not set
222# CONFIG_PPC_MPC5200_LPBFIFO is not set
192# CONFIG_PPC_PMAC is not set 223# CONFIG_PPC_PMAC is not set
193# CONFIG_PPC_CELL is not set 224# CONFIG_PPC_CELL is not set
194# CONFIG_PPC_CELL_NATIVE is not set 225# CONFIG_PPC_CELL_NATIVE is not set
@@ -243,6 +274,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 274CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
244# CONFIG_KEXEC is not set 275# CONFIG_KEXEC is not set
245# CONFIG_CRASH_DUMP is not set 276# CONFIG_CRASH_DUMP is not set
277CONFIG_SPARSE_IRQ=y
246CONFIG_MAX_ACTIVE_REGIONS=32 278CONFIG_MAX_ACTIVE_REGIONS=32
247CONFIG_ARCH_FLATMEM_ENABLE=y 279CONFIG_ARCH_FLATMEM_ENABLE=y
248CONFIG_ARCH_POPULATES_NODE_MAP=y 280CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -259,8 +291,6 @@ CONFIG_MIGRATION=y
259CONFIG_ZONE_DMA_FLAG=1 291CONFIG_ZONE_DMA_FLAG=1
260CONFIG_BOUNCE=y 292CONFIG_BOUNCE=y
261CONFIG_VIRT_TO_BUS=y 293CONFIG_VIRT_TO_BUS=y
262CONFIG_HAVE_MLOCK=y
263CONFIG_HAVE_MLOCKED_PAGE_BIT=y
264# CONFIG_KSM is not set 294# CONFIG_KSM is not set
265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 295CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
266CONFIG_PPC_4K_PAGES=y 296CONFIG_PPC_4K_PAGES=y
@@ -273,6 +303,7 @@ CONFIG_PROC_DEVICETREE=y
273CONFIG_EXTRA_TARGETS="" 303CONFIG_EXTRA_TARGETS=""
274CONFIG_PM=y 304CONFIG_PM=y
275# CONFIG_PM_DEBUG is not set 305# CONFIG_PM_DEBUG is not set
306# CONFIG_HIBERNATION is not set
276# CONFIG_PM_RUNTIME is not set 307# CONFIG_PM_RUNTIME is not set
277CONFIG_SECCOMP=y 308CONFIG_SECCOMP=y
278CONFIG_ISA_DMA_API=y 309CONFIG_ISA_DMA_API=y
@@ -378,7 +409,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_IRDA is not set 409# CONFIG_IRDA is not set
379# CONFIG_BT is not set 410# CONFIG_BT is not set
380# CONFIG_AF_RXRPC is not set 411# CONFIG_AF_RXRPC is not set
381# CONFIG_WIRELESS is not set 412CONFIG_WIRELESS=y
413# CONFIG_CFG80211 is not set
414# CONFIG_LIB80211 is not set
415
416#
417# CFG80211 needs to be enabled for MAC80211
418#
382# CONFIG_WIMAX is not set 419# CONFIG_WIMAX is not set
383# CONFIG_RFKILL is not set 420# CONFIG_RFKILL is not set
384# CONFIG_NET_9P is not set 421# CONFIG_NET_9P is not set
@@ -489,6 +526,10 @@ CONFIG_BLK_DEV=y
489# CONFIG_BLK_DEV_COW_COMMON is not set 526# CONFIG_BLK_DEV_COW_COMMON is not set
490CONFIG_BLK_DEV_LOOP=y 527CONFIG_BLK_DEV_LOOP=y
491# CONFIG_BLK_DEV_CRYPTOLOOP is not set 528# CONFIG_BLK_DEV_CRYPTOLOOP is not set
529
530#
531# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
532#
492# CONFIG_BLK_DEV_NBD is not set 533# CONFIG_BLK_DEV_NBD is not set
493# CONFIG_BLK_DEV_UB is not set 534# CONFIG_BLK_DEV_UB is not set
494CONFIG_BLK_DEV_RAM=y 535CONFIG_BLK_DEV_RAM=y
@@ -587,8 +628,8 @@ CONFIG_FEC_MPC52xx_MDIO=y
587# CONFIG_NETDEV_1000 is not set 628# CONFIG_NETDEV_1000 is not set
588# CONFIG_NETDEV_10000 is not set 629# CONFIG_NETDEV_10000 is not set
589CONFIG_WLAN=y 630CONFIG_WLAN=y
590# CONFIG_WLAN_PRE80211 is not set 631# CONFIG_USB_ZD1201 is not set
591# CONFIG_WLAN_80211 is not set 632# CONFIG_HOSTAP is not set
592 633
593# 634#
594# Enable WiMAX (Networking options) to see the WiMAX drivers 635# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -643,6 +684,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
643CONFIG_SERIAL_MPC52xx=y 684CONFIG_SERIAL_MPC52xx=y
644CONFIG_SERIAL_MPC52xx_CONSOLE=y 685CONFIG_SERIAL_MPC52xx_CONSOLE=y
645CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600 686CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600
687# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
646CONFIG_UNIX98_PTYS=y 688CONFIG_UNIX98_PTYS=y
647# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 689# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
648CONFIG_LEGACY_PTYS=y 690CONFIG_LEGACY_PTYS=y
@@ -688,7 +730,6 @@ CONFIG_I2C_MPC=y
688# 730#
689# Miscellaneous I2C Chip support 731# Miscellaneous I2C Chip support
690# 732#
691# CONFIG_DS1682 is not set
692# CONFIG_SENSORS_TSL2550 is not set 733# CONFIG_SENSORS_TSL2550 is not set
693# CONFIG_I2C_DEBUG_CORE is not set 734# CONFIG_I2C_DEBUG_CORE is not set
694# CONFIG_I2C_DEBUG_ALGO is not set 735# CONFIG_I2C_DEBUG_ALGO is not set
@@ -735,11 +776,13 @@ CONFIG_SSB_POSSIBLE=y
735# CONFIG_TWL4030_CORE is not set 776# CONFIG_TWL4030_CORE is not set
736# CONFIG_MFD_TMIO is not set 777# CONFIG_MFD_TMIO is not set
737# CONFIG_PMIC_DA903X is not set 778# CONFIG_PMIC_DA903X is not set
779# CONFIG_PMIC_ADP5520 is not set
738# CONFIG_MFD_WM8400 is not set 780# CONFIG_MFD_WM8400 is not set
739# CONFIG_MFD_WM831X is not set 781# CONFIG_MFD_WM831X is not set
740# CONFIG_MFD_WM8350_I2C is not set 782# CONFIG_MFD_WM8350_I2C is not set
741# CONFIG_MFD_PCF50633 is not set 783# CONFIG_MFD_PCF50633 is not set
742# CONFIG_AB3100_CORE is not set 784# CONFIG_AB3100_CORE is not set
785# CONFIG_MFD_88PM8607 is not set
743# CONFIG_REGULATOR is not set 786# CONFIG_REGULATOR is not set
744# CONFIG_MEDIA_SUPPORT is not set 787# CONFIG_MEDIA_SUPPORT is not set
745 788
@@ -797,7 +840,6 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
797# CONFIG_USB_SL811_HCD is not set 840# CONFIG_USB_SL811_HCD is not set
798# CONFIG_USB_R8A66597_HCD is not set 841# CONFIG_USB_R8A66597_HCD is not set
799# CONFIG_USB_HWA_HCD is not set 842# CONFIG_USB_HWA_HCD is not set
800# CONFIG_USB_MUSB_HDRC is not set
801 843
802# 844#
803# USB Device Class drivers 845# USB Device Class drivers
@@ -1137,6 +1179,7 @@ CONFIG_SCHED_DEBUG=y
1137# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1179# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1138# CONFIG_FAULT_INJECTION is not set 1180# CONFIG_FAULT_INJECTION is not set
1139# CONFIG_LATENCYTOP is not set 1181# CONFIG_LATENCYTOP is not set
1182# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1140# CONFIG_DEBUG_PAGEALLOC is not set 1183# CONFIG_DEBUG_PAGEALLOC is not set
1141CONFIG_HAVE_FUNCTION_TRACER=y 1184CONFIG_HAVE_FUNCTION_TRACER=y
1142CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1185CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1180,7 +1223,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1180# CONFIG_KEYS is not set 1223# CONFIG_KEYS is not set
1181# CONFIG_SECURITY is not set 1224# CONFIG_SECURITY is not set
1182# CONFIG_SECURITYFS is not set 1225# CONFIG_SECURITYFS is not set
1183# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1226# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1227# CONFIG_DEFAULT_SECURITY_SMACK is not set
1228# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1229CONFIG_DEFAULT_SECURITY_DAC=y
1230CONFIG_DEFAULT_SECURITY=""
1184CONFIG_CRYPTO=y 1231CONFIG_CRYPTO=y
1185 1232
1186# 1233#
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig
index f5c07fd72239..7b3f4d0ed404 100644
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:24 2009 4# Wed Dec 30 14:45:09 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61CONFIG_ARCH_SUSPEND_POSSIBLE=y 63CONFIG_ARCH_SUSPEND_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
@@ -86,6 +88,7 @@ CONFIG_SYSVIPC_SYSCTL=y
86# 88#
87CONFIG_TREE_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_PREEMPT_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
91# CONFIG_TINY_RCU is not set
89# CONFIG_RCU_TRACE is not set 92# CONFIG_RCU_TRACE is not set
90CONFIG_RCU_FANOUT=32 93CONFIG_RCU_FANOUT=32
91# CONFIG_RCU_FANOUT_EXACT is not set 94# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184CONFIG_FREEZER=y 214CONFIG_FREEZER=y
185 215
186# 216#
@@ -196,6 +226,7 @@ CONFIG_PPC_LITE5200=y
196# CONFIG_PPC_MEDIA5200 is not set 226# CONFIG_PPC_MEDIA5200 is not set
197# CONFIG_PPC_MPC5200_BUGFIX is not set 227# CONFIG_PPC_MPC5200_BUGFIX is not set
198# CONFIG_PPC_MPC5200_GPIO is not set 228# CONFIG_PPC_MPC5200_GPIO is not set
229# CONFIG_PPC_MPC5200_LPBFIFO is not set
199# CONFIG_PPC_PMAC is not set 230# CONFIG_PPC_PMAC is not set
200# CONFIG_PPC_CELL is not set 231# CONFIG_PPC_CELL is not set
201# CONFIG_PPC_CELL_NATIVE is not set 232# CONFIG_PPC_CELL_NATIVE is not set
@@ -252,6 +283,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253# CONFIG_KEXEC is not set 284# CONFIG_KEXEC is not set
254# CONFIG_CRASH_DUMP is not set 285# CONFIG_CRASH_DUMP is not set
286CONFIG_SPARSE_IRQ=y
255CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
256CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
257CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -268,8 +300,6 @@ CONFIG_MIGRATION=y
268CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
269CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
270CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
271CONFIG_HAVE_MLOCK=y
272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set 303# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -285,6 +315,7 @@ CONFIG_PM=y
285CONFIG_PM_SLEEP=y 315CONFIG_PM_SLEEP=y
286CONFIG_SUSPEND=y 316CONFIG_SUSPEND=y
287CONFIG_SUSPEND_FREEZER=y 317CONFIG_SUSPEND_FREEZER=y
318# CONFIG_HIBERNATION is not set
288# CONFIG_PM_RUNTIME is not set 319# CONFIG_PM_RUNTIME is not set
289CONFIG_SECCOMP=y 320CONFIG_SECCOMP=y
290CONFIG_ISA_DMA_API=y 321CONFIG_ISA_DMA_API=y
@@ -398,7 +429,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_IRDA is not set 429# CONFIG_IRDA is not set
399# CONFIG_BT is not set 430# CONFIG_BT is not set
400# CONFIG_AF_RXRPC is not set 431# CONFIG_AF_RXRPC is not set
401# CONFIG_WIRELESS is not set 432CONFIG_WIRELESS=y
433# CONFIG_CFG80211 is not set
434# CONFIG_LIB80211 is not set
435
436#
437# CFG80211 needs to be enabled for MAC80211
438#
402# CONFIG_WIMAX is not set 439# CONFIG_WIMAX is not set
403# CONFIG_RFKILL is not set 440# CONFIG_RFKILL is not set
404# CONFIG_NET_9P is not set 441# CONFIG_NET_9P is not set
@@ -433,6 +470,10 @@ CONFIG_BLK_DEV=y
433# CONFIG_BLK_DEV_COW_COMMON is not set 470# CONFIG_BLK_DEV_COW_COMMON is not set
434CONFIG_BLK_DEV_LOOP=y 471CONFIG_BLK_DEV_LOOP=y
435# CONFIG_BLK_DEV_CRYPTOLOOP is not set 472# CONFIG_BLK_DEV_CRYPTOLOOP is not set
473
474#
475# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
476#
436# CONFIG_BLK_DEV_NBD is not set 477# CONFIG_BLK_DEV_NBD is not set
437# CONFIG_BLK_DEV_SX8 is not set 478# CONFIG_BLK_DEV_SX8 is not set
438CONFIG_BLK_DEV_RAM=y 479CONFIG_BLK_DEV_RAM=y
@@ -443,6 +484,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
443# CONFIG_ATA_OVER_ETH is not set 484# CONFIG_ATA_OVER_ETH is not set
444# CONFIG_BLK_DEV_HD is not set 485# CONFIG_BLK_DEV_HD is not set
445CONFIG_MISC_DEVICES=y 486CONFIG_MISC_DEVICES=y
487# CONFIG_AD525X_DPOT is not set
446# CONFIG_PHANTOM is not set 488# CONFIG_PHANTOM is not set
447# CONFIG_SGI_IOC4 is not set 489# CONFIG_SGI_IOC4 is not set
448# CONFIG_TIFM_CORE is not set 490# CONFIG_TIFM_CORE is not set
@@ -450,6 +492,7 @@ CONFIG_MISC_DEVICES=y
450# CONFIG_ENCLOSURE_SERVICES is not set 492# CONFIG_ENCLOSURE_SERVICES is not set
451# CONFIG_HP_ILO is not set 493# CONFIG_HP_ILO is not set
452# CONFIG_ISL29003 is not set 494# CONFIG_ISL29003 is not set
495# CONFIG_DS1682 is not set
453# CONFIG_C2PORT is not set 496# CONFIG_C2PORT is not set
454 497
455# 498#
@@ -502,7 +545,9 @@ CONFIG_SCSI_LOWLEVEL=y
502# CONFIG_SCSI_BNX2_ISCSI is not set 545# CONFIG_SCSI_BNX2_ISCSI is not set
503# CONFIG_BE2ISCSI is not set 546# CONFIG_BE2ISCSI is not set
504# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 547# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
548# CONFIG_SCSI_HPSA is not set
505# CONFIG_SCSI_3W_9XXX is not set 549# CONFIG_SCSI_3W_9XXX is not set
550# CONFIG_SCSI_3W_SAS is not set
506# CONFIG_SCSI_ACARD is not set 551# CONFIG_SCSI_ACARD is not set
507# CONFIG_SCSI_AACRAID is not set 552# CONFIG_SCSI_AACRAID is not set
508# CONFIG_SCSI_AIC7XXX is not set 553# CONFIG_SCSI_AIC7XXX is not set
@@ -541,6 +586,7 @@ CONFIG_SCSI_LOWLEVEL=y
541# CONFIG_SCSI_NSP32 is not set 586# CONFIG_SCSI_NSP32 is not set
542# CONFIG_SCSI_DEBUG is not set 587# CONFIG_SCSI_DEBUG is not set
543# CONFIG_SCSI_PMCRAID is not set 588# CONFIG_SCSI_PMCRAID is not set
589# CONFIG_SCSI_PM8001 is not set
544# CONFIG_SCSI_SRP is not set 590# CONFIG_SCSI_SRP is not set
545# CONFIG_SCSI_BFA_FC is not set 591# CONFIG_SCSI_BFA_FC is not set
546# CONFIG_SCSI_DH is not set 592# CONFIG_SCSI_DH is not set
@@ -596,15 +642,16 @@ CONFIG_PATA_MPC52xx=y
596# CONFIG_PATA_NS87415 is not set 642# CONFIG_PATA_NS87415 is not set
597# CONFIG_PATA_OPTI is not set 643# CONFIG_PATA_OPTI is not set
598# CONFIG_PATA_OPTIDMA is not set 644# CONFIG_PATA_OPTIDMA is not set
645# CONFIG_PATA_PDC2027X is not set
599# CONFIG_PATA_PDC_OLD is not set 646# CONFIG_PATA_PDC_OLD is not set
600# CONFIG_PATA_RADISYS is not set 647# CONFIG_PATA_RADISYS is not set
601# CONFIG_PATA_RDC is not set 648# CONFIG_PATA_RDC is not set
602# CONFIG_PATA_RZ1000 is not set 649# CONFIG_PATA_RZ1000 is not set
603# CONFIG_PATA_SC1200 is not set 650# CONFIG_PATA_SC1200 is not set
604# CONFIG_PATA_SERVERWORKS is not set 651# CONFIG_PATA_SERVERWORKS is not set
605# CONFIG_PATA_PDC2027X is not set
606# CONFIG_PATA_SIL680 is not set 652# CONFIG_PATA_SIL680 is not set
607# CONFIG_PATA_SIS is not set 653# CONFIG_PATA_SIS is not set
654# CONFIG_PATA_TOSHIBA is not set
608# CONFIG_PATA_VIA is not set 655# CONFIG_PATA_VIA is not set
609# CONFIG_PATA_WINBOND is not set 656# CONFIG_PATA_WINBOND is not set
610# CONFIG_PATA_PLATFORM is not set 657# CONFIG_PATA_PLATFORM is not set
@@ -726,8 +773,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
726# CONFIG_BE2NET is not set 773# CONFIG_BE2NET is not set
727# CONFIG_TR is not set 774# CONFIG_TR is not set
728CONFIG_WLAN=y 775CONFIG_WLAN=y
729# CONFIG_WLAN_PRE80211 is not set 776# CONFIG_AIRO is not set
730# CONFIG_WLAN_80211 is not set 777# CONFIG_ATMEL is not set
778# CONFIG_PRISM54 is not set
779# CONFIG_HOSTAP is not set
731 780
732# 781#
733# Enable WiMAX (Networking options) to see the WiMAX drivers 782# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -741,6 +790,7 @@ CONFIG_WLAN=y
741# CONFIG_NETCONSOLE is not set 790# CONFIG_NETCONSOLE is not set
742# CONFIG_NETPOLL is not set 791# CONFIG_NETPOLL is not set
743# CONFIG_NET_POLL_CONTROLLER is not set 792# CONFIG_NET_POLL_CONTROLLER is not set
793# CONFIG_VMXNET3 is not set
744# CONFIG_ISDN is not set 794# CONFIG_ISDN is not set
745# CONFIG_PHONE is not set 795# CONFIG_PHONE is not set
746 796
@@ -778,6 +828,7 @@ CONFIG_SERIAL_MPC52xx=y
778CONFIG_SERIAL_MPC52xx_CONSOLE=y 828CONFIG_SERIAL_MPC52xx_CONSOLE=y
779CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 829CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
780# CONFIG_SERIAL_JSM is not set 830# CONFIG_SERIAL_JSM is not set
831# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
781CONFIG_UNIX98_PTYS=y 832CONFIG_UNIX98_PTYS=y
782# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 833# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
783CONFIG_LEGACY_PTYS=y 834CONFIG_LEGACY_PTYS=y
@@ -836,11 +887,6 @@ CONFIG_I2C_MPC=y
836# CONFIG_I2C_TAOS_EVM is not set 887# CONFIG_I2C_TAOS_EVM is not set
837 888
838# 889#
839# Graphics adapter I2C/DDC channel drivers
840#
841# CONFIG_I2C_VOODOO3 is not set
842
843#
844# Other I2C/SMBus bus drivers 890# Other I2C/SMBus bus drivers
845# 891#
846# CONFIG_I2C_PCA_PLATFORM is not set 892# CONFIG_I2C_PCA_PLATFORM is not set
@@ -849,7 +895,6 @@ CONFIG_I2C_MPC=y
849# 895#
850# Miscellaneous I2C Chip support 896# Miscellaneous I2C Chip support
851# 897#
852# CONFIG_DS1682 is not set
853# CONFIG_SENSORS_TSL2550 is not set 898# CONFIG_SENSORS_TSL2550 is not set
854# CONFIG_I2C_DEBUG_CORE is not set 899# CONFIG_I2C_DEBUG_CORE is not set
855# CONFIG_I2C_DEBUG_ALGO is not set 900# CONFIG_I2C_DEBUG_ALGO is not set
@@ -884,11 +929,13 @@ CONFIG_SSB_POSSIBLE=y
884# CONFIG_TWL4030_CORE is not set 929# CONFIG_TWL4030_CORE is not set
885# CONFIG_MFD_TMIO is not set 930# CONFIG_MFD_TMIO is not set
886# CONFIG_PMIC_DA903X is not set 931# CONFIG_PMIC_DA903X is not set
932# CONFIG_PMIC_ADP5520 is not set
887# CONFIG_MFD_WM8400 is not set 933# CONFIG_MFD_WM8400 is not set
888# CONFIG_MFD_WM831X is not set 934# CONFIG_MFD_WM831X is not set
889# CONFIG_MFD_WM8350_I2C is not set 935# CONFIG_MFD_WM8350_I2C is not set
890# CONFIG_MFD_PCF50633 is not set 936# CONFIG_MFD_PCF50633 is not set
891# CONFIG_AB3100_CORE is not set 937# CONFIG_AB3100_CORE is not set
938# CONFIG_MFD_88PM8607 is not set
892# CONFIG_REGULATOR is not set 939# CONFIG_REGULATOR is not set
893# CONFIG_MEDIA_SUPPORT is not set 940# CONFIG_MEDIA_SUPPORT is not set
894 941
@@ -1129,6 +1176,7 @@ CONFIG_DEBUG_INFO=y
1129# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1176# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1130# CONFIG_FAULT_INJECTION is not set 1177# CONFIG_FAULT_INJECTION is not set
1131# CONFIG_LATENCYTOP is not set 1178# CONFIG_LATENCYTOP is not set
1179# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1132# CONFIG_DEBUG_PAGEALLOC is not set 1180# CONFIG_DEBUG_PAGEALLOC is not set
1133CONFIG_HAVE_FUNCTION_TRACER=y 1181CONFIG_HAVE_FUNCTION_TRACER=y
1134CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1182CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1172,7 +1220,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1172# CONFIG_KEYS is not set 1220# CONFIG_KEYS is not set
1173# CONFIG_SECURITY is not set 1221# CONFIG_SECURITY is not set
1174# CONFIG_SECURITYFS is not set 1222# CONFIG_SECURITYFS is not set
1175# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1223# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1224# CONFIG_DEFAULT_SECURITY_SMACK is not set
1225# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1226CONFIG_DEFAULT_SECURITY_DAC=y
1227CONFIG_DEFAULT_SECURITY=""
1176CONFIG_CRYPTO=y 1228CONFIG_CRYPTO=y
1177 1229
1178# 1230#
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index 4f77a1bdc8f9..eaae2d469aa0 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:22 2009 4# Wed Dec 30 14:45:08 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -166,14 +169,41 @@ CONFIG_LBDAF=y
166# IO Schedulers 169# IO Schedulers
167# 170#
168CONFIG_IOSCHED_NOOP=y 171CONFIG_IOSCHED_NOOP=y
169CONFIG_IOSCHED_AS=y
170CONFIG_IOSCHED_DEADLINE=y 172CONFIG_IOSCHED_DEADLINE=y
171CONFIG_IOSCHED_CFQ=y 173CONFIG_IOSCHED_CFQ=y
172CONFIG_DEFAULT_AS=y
173# CONFIG_DEFAULT_DEADLINE is not set 174# CONFIG_DEFAULT_DEADLINE is not set
174# CONFIG_DEFAULT_CFQ is not set 175CONFIG_DEFAULT_CFQ=y
175# CONFIG_DEFAULT_NOOP is not set 176# CONFIG_DEFAULT_NOOP is not set
176CONFIG_DEFAULT_IOSCHED="anticipatory" 177CONFIG_DEFAULT_IOSCHED="cfq"
178# CONFIG_INLINE_SPIN_TRYLOCK is not set
179# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
180# CONFIG_INLINE_SPIN_LOCK is not set
181# CONFIG_INLINE_SPIN_LOCK_BH is not set
182# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
184CONFIG_INLINE_SPIN_UNLOCK=y
185# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
186CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
187# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
188# CONFIG_INLINE_READ_TRYLOCK is not set
189# CONFIG_INLINE_READ_LOCK is not set
190# CONFIG_INLINE_READ_LOCK_BH is not set
191# CONFIG_INLINE_READ_LOCK_IRQ is not set
192# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
193CONFIG_INLINE_READ_UNLOCK=y
194# CONFIG_INLINE_READ_UNLOCK_BH is not set
195CONFIG_INLINE_READ_UNLOCK_IRQ=y
196# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_WRITE_TRYLOCK is not set
198# CONFIG_INLINE_WRITE_LOCK is not set
199# CONFIG_INLINE_WRITE_LOCK_BH is not set
200# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
202CONFIG_INLINE_WRITE_UNLOCK=y
203# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
204CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
205# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
206# CONFIG_MUTEX_SPIN_ON_OWNER is not set
177# CONFIG_FREEZER is not set 207# CONFIG_FREEZER is not set
178 208
179# 209#
@@ -189,6 +219,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
189# CONFIG_PPC_MEDIA5200 is not set 219# CONFIG_PPC_MEDIA5200 is not set
190# CONFIG_PPC_MPC5200_BUGFIX is not set 220# CONFIG_PPC_MPC5200_BUGFIX is not set
191# CONFIG_PPC_MPC5200_GPIO is not set 221# CONFIG_PPC_MPC5200_GPIO is not set
222# CONFIG_PPC_MPC5200_LPBFIFO is not set
192# CONFIG_PPC_PMAC is not set 223# CONFIG_PPC_PMAC is not set
193# CONFIG_PPC_CELL is not set 224# CONFIG_PPC_CELL is not set
194# CONFIG_PPC_CELL_NATIVE is not set 225# CONFIG_PPC_CELL_NATIVE is not set
@@ -244,6 +275,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 275CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245# CONFIG_KEXEC is not set 276# CONFIG_KEXEC is not set
246# CONFIG_CRASH_DUMP is not set 277# CONFIG_CRASH_DUMP is not set
278CONFIG_SPARSE_IRQ=y
247CONFIG_MAX_ACTIVE_REGIONS=32 279CONFIG_MAX_ACTIVE_REGIONS=32
248CONFIG_ARCH_FLATMEM_ENABLE=y 280CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_POPULATES_NODE_MAP=y 281CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -260,8 +292,6 @@ CONFIG_MIGRATION=y
260CONFIG_ZONE_DMA_FLAG=1 292CONFIG_ZONE_DMA_FLAG=1
261CONFIG_BOUNCE=y 293CONFIG_BOUNCE=y
262CONFIG_VIRT_TO_BUS=y 294CONFIG_VIRT_TO_BUS=y
263CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y
265# CONFIG_KSM is not set 295# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 296CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 297CONFIG_PPC_4K_PAGES=y
@@ -274,6 +304,7 @@ CONFIG_PROC_DEVICETREE=y
274CONFIG_EXTRA_TARGETS="" 304CONFIG_EXTRA_TARGETS=""
275CONFIG_PM=y 305CONFIG_PM=y
276# CONFIG_PM_DEBUG is not set 306# CONFIG_PM_DEBUG is not set
307# CONFIG_HIBERNATION is not set
277# CONFIG_PM_RUNTIME is not set 308# CONFIG_PM_RUNTIME is not set
278CONFIG_SECCOMP=y 309CONFIG_SECCOMP=y
279CONFIG_ISA_DMA_API=y 310CONFIG_ISA_DMA_API=y
@@ -379,7 +410,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
379# CONFIG_IRDA is not set 410# CONFIG_IRDA is not set
380# CONFIG_BT is not set 411# CONFIG_BT is not set
381# CONFIG_AF_RXRPC is not set 412# CONFIG_AF_RXRPC is not set
382# CONFIG_WIRELESS is not set 413CONFIG_WIRELESS=y
414# CONFIG_CFG80211 is not set
415# CONFIG_LIB80211 is not set
416
417#
418# CFG80211 needs to be enabled for MAC80211
419#
383# CONFIG_WIMAX is not set 420# CONFIG_WIMAX is not set
384# CONFIG_RFKILL is not set 421# CONFIG_RFKILL is not set
385# CONFIG_NET_9P is not set 422# CONFIG_NET_9P is not set
@@ -490,6 +527,10 @@ CONFIG_BLK_DEV=y
490# CONFIG_BLK_DEV_COW_COMMON is not set 527# CONFIG_BLK_DEV_COW_COMMON is not set
491CONFIG_BLK_DEV_LOOP=y 528CONFIG_BLK_DEV_LOOP=y
492# CONFIG_BLK_DEV_CRYPTOLOOP is not set 529# CONFIG_BLK_DEV_CRYPTOLOOP is not set
530
531#
532# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
533#
493# CONFIG_BLK_DEV_NBD is not set 534# CONFIG_BLK_DEV_NBD is not set
494CONFIG_BLK_DEV_RAM=y 535CONFIG_BLK_DEV_RAM=y
495CONFIG_BLK_DEV_RAM_COUNT=16 536CONFIG_BLK_DEV_RAM_COUNT=16
@@ -499,9 +540,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
499# CONFIG_ATA_OVER_ETH is not set 540# CONFIG_ATA_OVER_ETH is not set
500# CONFIG_BLK_DEV_HD is not set 541# CONFIG_BLK_DEV_HD is not set
501CONFIG_MISC_DEVICES=y 542CONFIG_MISC_DEVICES=y
543# CONFIG_AD525X_DPOT is not set
502# CONFIG_ICS932S401 is not set 544# CONFIG_ICS932S401 is not set
503# CONFIG_ENCLOSURE_SERVICES is not set 545# CONFIG_ENCLOSURE_SERVICES is not set
504# CONFIG_ISL29003 is not set 546# CONFIG_ISL29003 is not set
547# CONFIG_DS1682 is not set
505# CONFIG_C2PORT is not set 548# CONFIG_C2PORT is not set
506 549
507# 550#
@@ -610,8 +653,7 @@ CONFIG_FEC_MPC52xx_MDIO=y
610# CONFIG_NETDEV_1000 is not set 653# CONFIG_NETDEV_1000 is not set
611# CONFIG_NETDEV_10000 is not set 654# CONFIG_NETDEV_10000 is not set
612CONFIG_WLAN=y 655CONFIG_WLAN=y
613# CONFIG_WLAN_PRE80211 is not set 656# CONFIG_HOSTAP is not set
614# CONFIG_WLAN_80211 is not set
615 657
616# 658#
617# Enable WiMAX (Networking options) to see the WiMAX drivers 659# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -657,6 +699,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
657CONFIG_SERIAL_MPC52xx=y 699CONFIG_SERIAL_MPC52xx=y
658CONFIG_SERIAL_MPC52xx_CONSOLE=y 700CONFIG_SERIAL_MPC52xx_CONSOLE=y
659CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 701CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
702# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
660CONFIG_UNIX98_PTYS=y 703CONFIG_UNIX98_PTYS=y
661# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 704# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
662CONFIG_LEGACY_PTYS=y 705CONFIG_LEGACY_PTYS=y
@@ -700,7 +743,6 @@ CONFIG_I2C_MPC=y
700# 743#
701# Miscellaneous I2C Chip support 744# Miscellaneous I2C Chip support
702# 745#
703# CONFIG_DS1682 is not set
704# CONFIG_SENSORS_TSL2550 is not set 746# CONFIG_SENSORS_TSL2550 is not set
705# CONFIG_I2C_DEBUG_CORE is not set 747# CONFIG_I2C_DEBUG_CORE is not set
706# CONFIG_I2C_DEBUG_ALGO is not set 748# CONFIG_I2C_DEBUG_ALGO is not set
@@ -745,6 +787,7 @@ CONFIG_HWMON=y
745# CONFIG_SENSORS_GL520SM is not set 787# CONFIG_SENSORS_GL520SM is not set
746# CONFIG_SENSORS_IT87 is not set 788# CONFIG_SENSORS_IT87 is not set
747# CONFIG_SENSORS_LM63 is not set 789# CONFIG_SENSORS_LM63 is not set
790# CONFIG_SENSORS_LM73 is not set
748# CONFIG_SENSORS_LM75 is not set 791# CONFIG_SENSORS_LM75 is not set
749# CONFIG_SENSORS_LM77 is not set 792# CONFIG_SENSORS_LM77 is not set
750# CONFIG_SENSORS_LM78 is not set 793# CONFIG_SENSORS_LM78 is not set
@@ -805,11 +848,13 @@ CONFIG_SSB_POSSIBLE=y
805# CONFIG_TWL4030_CORE is not set 848# CONFIG_TWL4030_CORE is not set
806# CONFIG_MFD_TMIO is not set 849# CONFIG_MFD_TMIO is not set
807# CONFIG_PMIC_DA903X is not set 850# CONFIG_PMIC_DA903X is not set
851# CONFIG_PMIC_ADP5520 is not set
808# CONFIG_MFD_WM8400 is not set 852# CONFIG_MFD_WM8400 is not set
809# CONFIG_MFD_WM831X is not set 853# CONFIG_MFD_WM831X is not set
810# CONFIG_MFD_WM8350_I2C is not set 854# CONFIG_MFD_WM8350_I2C is not set
811# CONFIG_MFD_PCF50633 is not set 855# CONFIG_MFD_PCF50633 is not set
812# CONFIG_AB3100_CORE is not set 856# CONFIG_AB3100_CORE is not set
857# CONFIG_MFD_88PM8607 is not set
813# CONFIG_REGULATOR is not set 858# CONFIG_REGULATOR is not set
814# CONFIG_MEDIA_SUPPORT is not set 859# CONFIG_MEDIA_SUPPORT is not set
815 860
@@ -881,6 +926,7 @@ CONFIG_RTC_DRV_DS1307=y
881# CONFIG_RTC_DRV_PCF8563 is not set 926# CONFIG_RTC_DRV_PCF8563 is not set
882# CONFIG_RTC_DRV_PCF8583 is not set 927# CONFIG_RTC_DRV_PCF8583 is not set
883# CONFIG_RTC_DRV_M41T80 is not set 928# CONFIG_RTC_DRV_M41T80 is not set
929# CONFIG_RTC_DRV_BQ32K is not set
884# CONFIG_RTC_DRV_S35390A is not set 930# CONFIG_RTC_DRV_S35390A is not set
885# CONFIG_RTC_DRV_FM3130 is not set 931# CONFIG_RTC_DRV_FM3130 is not set
886# CONFIG_RTC_DRV_RX8581 is not set 932# CONFIG_RTC_DRV_RX8581 is not set
@@ -902,7 +948,9 @@ CONFIG_RTC_DRV_DS1307=y
902# CONFIG_RTC_DRV_M48T86 is not set 948# CONFIG_RTC_DRV_M48T86 is not set
903# CONFIG_RTC_DRV_M48T35 is not set 949# CONFIG_RTC_DRV_M48T35 is not set
904# CONFIG_RTC_DRV_M48T59 is not set 950# CONFIG_RTC_DRV_M48T59 is not set
951# CONFIG_RTC_DRV_MSM6242 is not set
905# CONFIG_RTC_DRV_BQ4802 is not set 952# CONFIG_RTC_DRV_BQ4802 is not set
953# CONFIG_RTC_DRV_RP5C01 is not set
906# CONFIG_RTC_DRV_V3020 is not set 954# CONFIG_RTC_DRV_V3020 is not set
907 955
908# 956#
@@ -1172,6 +1220,7 @@ CONFIG_DEBUG_INFO=y
1172# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1220# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1173# CONFIG_FAULT_INJECTION is not set 1221# CONFIG_FAULT_INJECTION is not set
1174# CONFIG_LATENCYTOP is not set 1222# CONFIG_LATENCYTOP is not set
1223# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1175# CONFIG_DEBUG_PAGEALLOC is not set 1224# CONFIG_DEBUG_PAGEALLOC is not set
1176CONFIG_HAVE_FUNCTION_TRACER=y 1225CONFIG_HAVE_FUNCTION_TRACER=y
1177CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1226CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1215,7 +1264,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1215# CONFIG_KEYS is not set 1264# CONFIG_KEYS is not set
1216# CONFIG_SECURITY is not set 1265# CONFIG_SECURITY is not set
1217# CONFIG_SECURITYFS is not set 1266# CONFIG_SECURITYFS is not set
1218# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1267# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1268# CONFIG_DEFAULT_SECURITY_SMACK is not set
1269# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1270CONFIG_DEFAULT_SECURITY_DAC=y
1271CONFIG_DEFAULT_SECURITY=""
1219CONFIG_CRYPTO=y 1272CONFIG_CRYPTO=y
1220 1273
1221# 1274#
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig
index f9168c1a2fa5..1742c0200b75 100644
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:25 2009 4# Wed Dec 30 14:45:10 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -87,6 +89,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -172,14 +175,41 @@ CONFIG_LBDAF=y
172# IO Schedulers 175# IO Schedulers
173# 176#
174CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
175# CONFIG_IOSCHED_AS is not set
176# CONFIG_IOSCHED_DEADLINE is not set 178# CONFIG_IOSCHED_DEADLINE is not set
177# CONFIG_IOSCHED_CFQ is not set 179# CONFIG_IOSCHED_CFQ is not set
178# CONFIG_DEFAULT_AS is not set
179# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
180# CONFIG_DEFAULT_CFQ is not set 181# CONFIG_DEFAULT_CFQ is not set
181CONFIG_DEFAULT_NOOP=y 182CONFIG_DEFAULT_NOOP=y
182CONFIG_DEFAULT_IOSCHED="noop" 183CONFIG_DEFAULT_IOSCHED="noop"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190# CONFIG_INLINE_SPIN_UNLOCK is not set
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199# CONFIG_INLINE_READ_UNLOCK is not set
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208# CONFIG_INLINE_WRITE_UNLOCK is not set
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
183# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
184 214
185# 215#
@@ -195,6 +225,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
195# CONFIG_PPC_MEDIA5200 is not set 225# CONFIG_PPC_MEDIA5200 is not set
196# CONFIG_PPC_MPC5200_BUGFIX is not set 226# CONFIG_PPC_MPC5200_BUGFIX is not set
197# CONFIG_PPC_MPC5200_GPIO is not set 227# CONFIG_PPC_MPC5200_GPIO is not set
228# CONFIG_PPC_MPC5200_LPBFIFO is not set
198# CONFIG_PPC_PMAC is not set 229# CONFIG_PPC_PMAC is not set
199# CONFIG_PPC_CELL is not set 230# CONFIG_PPC_CELL is not set
200# CONFIG_PPC_CELL_NATIVE is not set 231# CONFIG_PPC_CELL_NATIVE is not set
@@ -251,6 +282,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 282CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
252# CONFIG_KEXEC is not set 283# CONFIG_KEXEC is not set
253# CONFIG_CRASH_DUMP is not set 284# CONFIG_CRASH_DUMP is not set
285CONFIG_SPARSE_IRQ=y
254CONFIG_MAX_ACTIVE_REGIONS=32 286CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 287CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 288CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -267,8 +299,6 @@ CONFIG_MIGRATION=y
267CONFIG_ZONE_DMA_FLAG=1 299CONFIG_ZONE_DMA_FLAG=1
268CONFIG_BOUNCE=y 300CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 301CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set 302# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 303CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
274CONFIG_PPC_4K_PAGES=y 304CONFIG_PPC_4K_PAGES=y
@@ -385,7 +415,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_IRDA is not set 415# CONFIG_IRDA is not set
386# CONFIG_BT is not set 416# CONFIG_BT is not set
387# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
388# CONFIG_WIRELESS is not set 418CONFIG_WIRELESS=y
419# CONFIG_CFG80211 is not set
420# CONFIG_LIB80211 is not set
421
422#
423# CFG80211 needs to be enabled for MAC80211
424#
389# CONFIG_WIMAX is not set 425# CONFIG_WIMAX is not set
390# CONFIG_RFKILL is not set 426# CONFIG_RFKILL is not set
391# CONFIG_NET_9P is not set 427# CONFIG_NET_9P is not set
@@ -585,15 +621,16 @@ CONFIG_PATA_MPC52xx=m
585# CONFIG_PATA_NS87415 is not set 621# CONFIG_PATA_NS87415 is not set
586# CONFIG_PATA_OPTI is not set 622# CONFIG_PATA_OPTI is not set
587# CONFIG_PATA_OPTIDMA is not set 623# CONFIG_PATA_OPTIDMA is not set
624# CONFIG_PATA_PDC2027X is not set
588# CONFIG_PATA_PDC_OLD is not set 625# CONFIG_PATA_PDC_OLD is not set
589# CONFIG_PATA_RADISYS is not set 626# CONFIG_PATA_RADISYS is not set
590# CONFIG_PATA_RDC is not set 627# CONFIG_PATA_RDC is not set
591# CONFIG_PATA_RZ1000 is not set 628# CONFIG_PATA_RZ1000 is not set
592# CONFIG_PATA_SC1200 is not set 629# CONFIG_PATA_SC1200 is not set
593# CONFIG_PATA_SERVERWORKS is not set 630# CONFIG_PATA_SERVERWORKS is not set
594# CONFIG_PATA_PDC2027X is not set
595# CONFIG_PATA_SIL680 is not set 631# CONFIG_PATA_SIL680 is not set
596# CONFIG_PATA_SIS is not set 632# CONFIG_PATA_SIS is not set
633# CONFIG_PATA_TOSHIBA is not set
597# CONFIG_PATA_VIA is not set 634# CONFIG_PATA_VIA is not set
598# CONFIG_PATA_WINBOND is not set 635# CONFIG_PATA_WINBOND is not set
599# CONFIG_PATA_PLATFORM is not set 636# CONFIG_PATA_PLATFORM is not set
@@ -673,8 +710,11 @@ CONFIG_FEC_MPC52xx_MDIO=y
673# CONFIG_NETDEV_10000 is not set 710# CONFIG_NETDEV_10000 is not set
674# CONFIG_TR is not set 711# CONFIG_TR is not set
675CONFIG_WLAN=y 712CONFIG_WLAN=y
676# CONFIG_WLAN_PRE80211 is not set 713# CONFIG_AIRO is not set
677# CONFIG_WLAN_80211 is not set 714# CONFIG_ATMEL is not set
715# CONFIG_PRISM54 is not set
716# CONFIG_USB_ZD1201 is not set
717# CONFIG_HOSTAP is not set
678 718
679# 719#
680# Enable WiMAX (Networking options) to see the WiMAX drivers 720# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -697,6 +737,7 @@ CONFIG_WLAN=y
697# CONFIG_NETCONSOLE is not set 737# CONFIG_NETCONSOLE is not set
698# CONFIG_NETPOLL is not set 738# CONFIG_NETPOLL is not set
699# CONFIG_NET_POLL_CONTROLLER is not set 739# CONFIG_NET_POLL_CONTROLLER is not set
740# CONFIG_VMXNET3 is not set
700# CONFIG_ISDN is not set 741# CONFIG_ISDN is not set
701# CONFIG_PHONE is not set 742# CONFIG_PHONE is not set
702 743
@@ -734,6 +775,7 @@ CONFIG_SERIAL_MPC52xx=y
734CONFIG_SERIAL_MPC52xx_CONSOLE=y 775CONFIG_SERIAL_MPC52xx_CONSOLE=y
735CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 776CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600
736# CONFIG_SERIAL_JSM is not set 777# CONFIG_SERIAL_JSM is not set
778# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
737CONFIG_UNIX98_PTYS=y 779CONFIG_UNIX98_PTYS=y
738# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 780# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
739# CONFIG_LEGACY_PTYS is not set 781# CONFIG_LEGACY_PTYS is not set
@@ -791,11 +833,6 @@ CONFIG_I2C_MPC=y
791# CONFIG_I2C_TINY_USB is not set 833# CONFIG_I2C_TINY_USB is not set
792 834
793# 835#
794# Graphics adapter I2C/DDC channel drivers
795#
796# CONFIG_I2C_VOODOO3 is not set
797
798#
799# Other I2C/SMBus bus drivers 836# Other I2C/SMBus bus drivers
800# 837#
801# CONFIG_I2C_PCA_PLATFORM is not set 838# CONFIG_I2C_PCA_PLATFORM is not set
@@ -804,7 +841,6 @@ CONFIG_I2C_MPC=y
804# 841#
805# Miscellaneous I2C Chip support 842# Miscellaneous I2C Chip support
806# 843#
807# CONFIG_DS1682 is not set
808# CONFIG_SENSORS_TSL2550 is not set 844# CONFIG_SENSORS_TSL2550 is not set
809# CONFIG_I2C_DEBUG_CORE is not set 845# CONFIG_I2C_DEBUG_CORE is not set
810# CONFIG_I2C_DEBUG_ALGO is not set 846# CONFIG_I2C_DEBUG_ALGO is not set
@@ -839,11 +875,13 @@ CONFIG_SSB_POSSIBLE=y
839# CONFIG_TWL4030_CORE is not set 875# CONFIG_TWL4030_CORE is not set
840# CONFIG_MFD_TMIO is not set 876# CONFIG_MFD_TMIO is not set
841# CONFIG_PMIC_DA903X is not set 877# CONFIG_PMIC_DA903X is not set
878# CONFIG_PMIC_ADP5520 is not set
842# CONFIG_MFD_WM8400 is not set 879# CONFIG_MFD_WM8400 is not set
843# CONFIG_MFD_WM831X is not set 880# CONFIG_MFD_WM831X is not set
844# CONFIG_MFD_WM8350_I2C is not set 881# CONFIG_MFD_WM8350_I2C is not set
845# CONFIG_MFD_PCF50633 is not set 882# CONFIG_MFD_PCF50633 is not set
846# CONFIG_AB3100_CORE is not set 883# CONFIG_AB3100_CORE is not set
884# CONFIG_MFD_88PM8607 is not set
847# CONFIG_REGULATOR is not set 885# CONFIG_REGULATOR is not set
848# CONFIG_MEDIA_SUPPORT is not set 886# CONFIG_MEDIA_SUPPORT is not set
849 887
@@ -908,7 +946,6 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
908# CONFIG_USB_R8A66597_HCD is not set 946# CONFIG_USB_R8A66597_HCD is not set
909# CONFIG_USB_WHCI_HCD is not set 947# CONFIG_USB_WHCI_HCD is not set
910# CONFIG_USB_HWA_HCD is not set 948# CONFIG_USB_HWA_HCD is not set
911# CONFIG_USB_MUSB_HDRC is not set
912 949
913# 950#
914# USB Device Class drivers 951# USB Device Class drivers
@@ -1011,6 +1048,7 @@ CONFIG_RTC_INTF_DEV=y
1011CONFIG_RTC_DRV_PCF8563=m 1048CONFIG_RTC_DRV_PCF8563=m
1012# CONFIG_RTC_DRV_PCF8583 is not set 1049# CONFIG_RTC_DRV_PCF8583 is not set
1013# CONFIG_RTC_DRV_M41T80 is not set 1050# CONFIG_RTC_DRV_M41T80 is not set
1051# CONFIG_RTC_DRV_BQ32K is not set
1014# CONFIG_RTC_DRV_S35390A is not set 1052# CONFIG_RTC_DRV_S35390A is not set
1015# CONFIG_RTC_DRV_FM3130 is not set 1053# CONFIG_RTC_DRV_FM3130 is not set
1016# CONFIG_RTC_DRV_RX8581 is not set 1054# CONFIG_RTC_DRV_RX8581 is not set
@@ -1032,7 +1070,9 @@ CONFIG_RTC_DRV_PCF8563=m
1032# CONFIG_RTC_DRV_M48T86 is not set 1070# CONFIG_RTC_DRV_M48T86 is not set
1033# CONFIG_RTC_DRV_M48T35 is not set 1071# CONFIG_RTC_DRV_M48T35 is not set
1034# CONFIG_RTC_DRV_M48T59 is not set 1072# CONFIG_RTC_DRV_M48T59 is not set
1073# CONFIG_RTC_DRV_MSM6242 is not set
1035# CONFIG_RTC_DRV_BQ4802 is not set 1074# CONFIG_RTC_DRV_BQ4802 is not set
1075# CONFIG_RTC_DRV_RP5C01 is not set
1036# CONFIG_RTC_DRV_V3020 is not set 1076# CONFIG_RTC_DRV_V3020 is not set
1037 1077
1038# 1078#
@@ -1243,10 +1283,11 @@ CONFIG_FRAME_WARN=1024
1243# CONFIG_DEBUG_FS is not set 1283# CONFIG_DEBUG_FS is not set
1244# CONFIG_HEADERS_CHECK is not set 1284# CONFIG_HEADERS_CHECK is not set
1245# CONFIG_DEBUG_KERNEL is not set 1285# CONFIG_DEBUG_KERNEL is not set
1246# CONFIG_DEBUG_BUGVERBOSE is not set 1286CONFIG_DEBUG_BUGVERBOSE=y
1247# CONFIG_DEBUG_MEMORY_INIT is not set 1287# CONFIG_DEBUG_MEMORY_INIT is not set
1248# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1288# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1249# CONFIG_LATENCYTOP is not set 1289# CONFIG_LATENCYTOP is not set
1290# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1250CONFIG_HAVE_FUNCTION_TRACER=y 1291CONFIG_HAVE_FUNCTION_TRACER=y
1251CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1292CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1252CONFIG_HAVE_DYNAMIC_FTRACE=y 1293CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -1269,7 +1310,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1269# CONFIG_KEYS is not set 1310# CONFIG_KEYS is not set
1270# CONFIG_SECURITY is not set 1311# CONFIG_SECURITY is not set
1271# CONFIG_SECURITYFS is not set 1312# CONFIG_SECURITYFS is not set
1272# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1313# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1314# CONFIG_DEFAULT_SECURITY_SMACK is not set
1315# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1316CONFIG_DEFAULT_SECURITY_DAC=y
1317CONFIG_DEFAULT_SECURITY=""
1273# CONFIG_CRYPTO is not set 1318# CONFIG_CRYPTO is not set
1274CONFIG_PPC_CLOCK=y 1319CONFIG_PPC_CLOCK=y
1275CONFIG_PPC_LIB_RHEAP=y 1320CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index 75c835c2ae66..3972438db719 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:23 2009 4# Wed Dec 30 14:45:09 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +174,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 174# IO Schedulers
172# 175#
173CONFIG_IOSCHED_NOOP=y 176CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 177CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 178CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 179# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 180CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 181# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 182CONFIG_DEFAULT_IOSCHED="cfq"
183# CONFIG_INLINE_SPIN_TRYLOCK is not set
184# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
185# CONFIG_INLINE_SPIN_LOCK is not set
186# CONFIG_INLINE_SPIN_LOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
189CONFIG_INLINE_SPIN_UNLOCK=y
190# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
191CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
192# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
193# CONFIG_INLINE_READ_TRYLOCK is not set
194# CONFIG_INLINE_READ_LOCK is not set
195# CONFIG_INLINE_READ_LOCK_BH is not set
196# CONFIG_INLINE_READ_LOCK_IRQ is not set
197# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
198CONFIG_INLINE_READ_UNLOCK=y
199# CONFIG_INLINE_READ_UNLOCK_BH is not set
200CONFIG_INLINE_READ_UNLOCK_IRQ=y
201# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
202# CONFIG_INLINE_WRITE_TRYLOCK is not set
203# CONFIG_INLINE_WRITE_LOCK is not set
204# CONFIG_INLINE_WRITE_LOCK_BH is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
207CONFIG_INLINE_WRITE_UNLOCK=y
208# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
209CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
210# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
211# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 212# CONFIG_FREEZER is not set
183 213
184# 214#
@@ -194,6 +224,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
194# CONFIG_PPC_MEDIA5200 is not set 224# CONFIG_PPC_MEDIA5200 is not set
195CONFIG_PPC_MPC5200_BUGFIX=y 225CONFIG_PPC_MPC5200_BUGFIX=y
196# CONFIG_PPC_MPC5200_GPIO is not set 226# CONFIG_PPC_MPC5200_GPIO is not set
227# CONFIG_PPC_MPC5200_LPBFIFO is not set
197# CONFIG_PPC_PMAC is not set 228# CONFIG_PPC_PMAC is not set
198# CONFIG_PPC_CELL is not set 229# CONFIG_PPC_CELL is not set
199# CONFIG_PPC_CELL_NATIVE is not set 230# CONFIG_PPC_CELL_NATIVE is not set
@@ -249,6 +280,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
250# CONFIG_KEXEC is not set 281# CONFIG_KEXEC is not set
251# CONFIG_CRASH_DUMP is not set 282# CONFIG_CRASH_DUMP is not set
283CONFIG_SPARSE_IRQ=y
252CONFIG_MAX_ACTIVE_REGIONS=32 284CONFIG_MAX_ACTIVE_REGIONS=32
253CONFIG_ARCH_FLATMEM_ENABLE=y 285CONFIG_ARCH_FLATMEM_ENABLE=y
254CONFIG_ARCH_POPULATES_NODE_MAP=y 286CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -265,8 +297,6 @@ CONFIG_MIGRATION=y
265CONFIG_ZONE_DMA_FLAG=1 297CONFIG_ZONE_DMA_FLAG=1
266CONFIG_BOUNCE=y 298CONFIG_BOUNCE=y
267CONFIG_VIRT_TO_BUS=y 299CONFIG_VIRT_TO_BUS=y
268CONFIG_HAVE_MLOCK=y
269CONFIG_HAVE_MLOCKED_PAGE_BIT=y
270# CONFIG_KSM is not set 300# CONFIG_KSM is not set
271CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 301CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
272CONFIG_PPC_4K_PAGES=y 302CONFIG_PPC_4K_PAGES=y
@@ -279,6 +309,7 @@ CONFIG_PROC_DEVICETREE=y
279CONFIG_EXTRA_TARGETS="" 309CONFIG_EXTRA_TARGETS=""
280CONFIG_PM=y 310CONFIG_PM=y
281# CONFIG_PM_DEBUG is not set 311# CONFIG_PM_DEBUG is not set
312# CONFIG_HIBERNATION is not set
282# CONFIG_PM_RUNTIME is not set 313# CONFIG_PM_RUNTIME is not set
283CONFIG_SECCOMP=y 314CONFIG_SECCOMP=y
284CONFIG_ISA_DMA_API=y 315CONFIG_ISA_DMA_API=y
@@ -384,7 +415,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_IRDA is not set 415# CONFIG_IRDA is not set
385# CONFIG_BT is not set 416# CONFIG_BT is not set
386# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
387# CONFIG_WIRELESS is not set 418CONFIG_WIRELESS=y
419# CONFIG_CFG80211 is not set
420# CONFIG_LIB80211 is not set
421
422#
423# CFG80211 needs to be enabled for MAC80211
424#
388# CONFIG_WIMAX is not set 425# CONFIG_WIMAX is not set
389# CONFIG_RFKILL is not set 426# CONFIG_RFKILL is not set
390# CONFIG_NET_9P is not set 427# CONFIG_NET_9P is not set
@@ -496,6 +533,10 @@ CONFIG_BLK_DEV=y
496# CONFIG_BLK_DEV_COW_COMMON is not set 533# CONFIG_BLK_DEV_COW_COMMON is not set
497CONFIG_BLK_DEV_LOOP=y 534CONFIG_BLK_DEV_LOOP=y
498# CONFIG_BLK_DEV_CRYPTOLOOP is not set 535# CONFIG_BLK_DEV_CRYPTOLOOP is not set
536
537#
538# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
539#
499# CONFIG_BLK_DEV_NBD is not set 540# CONFIG_BLK_DEV_NBD is not set
500# CONFIG_BLK_DEV_UB is not set 541# CONFIG_BLK_DEV_UB is not set
501CONFIG_BLK_DEV_RAM=y 542CONFIG_BLK_DEV_RAM=y
@@ -607,8 +648,8 @@ CONFIG_FEC_MPC52xx_MDIO=y
607# CONFIG_NETDEV_1000 is not set 648# CONFIG_NETDEV_1000 is not set
608# CONFIG_NETDEV_10000 is not set 649# CONFIG_NETDEV_10000 is not set
609CONFIG_WLAN=y 650CONFIG_WLAN=y
610# CONFIG_WLAN_PRE80211 is not set 651# CONFIG_USB_ZD1201 is not set
611# CONFIG_WLAN_80211 is not set 652# CONFIG_HOSTAP is not set
612 653
613# 654#
614# Enable WiMAX (Networking options) to see the WiMAX drivers 655# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -663,6 +704,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
663CONFIG_SERIAL_MPC52xx=y 704CONFIG_SERIAL_MPC52xx=y
664CONFIG_SERIAL_MPC52xx_CONSOLE=y 705CONFIG_SERIAL_MPC52xx_CONSOLE=y
665CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 706CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
707# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
666CONFIG_UNIX98_PTYS=y 708CONFIG_UNIX98_PTYS=y
667# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 709# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
668CONFIG_LEGACY_PTYS=y 710CONFIG_LEGACY_PTYS=y
@@ -708,7 +750,6 @@ CONFIG_I2C_MPC=y
708# 750#
709# Miscellaneous I2C Chip support 751# Miscellaneous I2C Chip support
710# 752#
711# CONFIG_DS1682 is not set
712# CONFIG_SENSORS_TSL2550 is not set 753# CONFIG_SENSORS_TSL2550 is not set
713# CONFIG_I2C_DEBUG_CORE is not set 754# CONFIG_I2C_DEBUG_CORE is not set
714# CONFIG_I2C_DEBUG_ALGO is not set 755# CONFIG_I2C_DEBUG_ALGO is not set
@@ -753,6 +794,7 @@ CONFIG_HWMON=y
753# CONFIG_SENSORS_GL520SM is not set 794# CONFIG_SENSORS_GL520SM is not set
754# CONFIG_SENSORS_IT87 is not set 795# CONFIG_SENSORS_IT87 is not set
755# CONFIG_SENSORS_LM63 is not set 796# CONFIG_SENSORS_LM63 is not set
797# CONFIG_SENSORS_LM73 is not set
756# CONFIG_SENSORS_LM75 is not set 798# CONFIG_SENSORS_LM75 is not set
757# CONFIG_SENSORS_LM77 is not set 799# CONFIG_SENSORS_LM77 is not set
758# CONFIG_SENSORS_LM78 is not set 800# CONFIG_SENSORS_LM78 is not set
@@ -818,11 +860,13 @@ CONFIG_SSB_POSSIBLE=y
818# CONFIG_TWL4030_CORE is not set 860# CONFIG_TWL4030_CORE is not set
819# CONFIG_MFD_TMIO is not set 861# CONFIG_MFD_TMIO is not set
820# CONFIG_PMIC_DA903X is not set 862# CONFIG_PMIC_DA903X is not set
863# CONFIG_PMIC_ADP5520 is not set
821# CONFIG_MFD_WM8400 is not set 864# CONFIG_MFD_WM8400 is not set
822# CONFIG_MFD_WM831X is not set 865# CONFIG_MFD_WM831X is not set
823# CONFIG_MFD_WM8350_I2C is not set 866# CONFIG_MFD_WM8350_I2C is not set
824# CONFIG_MFD_PCF50633 is not set 867# CONFIG_MFD_PCF50633 is not set
825# CONFIG_AB3100_CORE is not set 868# CONFIG_AB3100_CORE is not set
869# CONFIG_MFD_88PM8607 is not set
826# CONFIG_REGULATOR is not set 870# CONFIG_REGULATOR is not set
827# CONFIG_MEDIA_SUPPORT is not set 871# CONFIG_MEDIA_SUPPORT is not set
828 872
@@ -880,7 +924,6 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
880# CONFIG_USB_SL811_HCD is not set 924# CONFIG_USB_SL811_HCD is not set
881# CONFIG_USB_R8A66597_HCD is not set 925# CONFIG_USB_R8A66597_HCD is not set
882# CONFIG_USB_HWA_HCD is not set 926# CONFIG_USB_HWA_HCD is not set
883# CONFIG_USB_MUSB_HDRC is not set
884 927
885# 928#
886# USB Device Class drivers 929# USB Device Class drivers
@@ -984,6 +1027,7 @@ CONFIG_RTC_DRV_DS1307=y
984# CONFIG_RTC_DRV_PCF8563 is not set 1027# CONFIG_RTC_DRV_PCF8563 is not set
985# CONFIG_RTC_DRV_PCF8583 is not set 1028# CONFIG_RTC_DRV_PCF8583 is not set
986# CONFIG_RTC_DRV_M41T80 is not set 1029# CONFIG_RTC_DRV_M41T80 is not set
1030# CONFIG_RTC_DRV_BQ32K is not set
987# CONFIG_RTC_DRV_S35390A is not set 1031# CONFIG_RTC_DRV_S35390A is not set
988# CONFIG_RTC_DRV_FM3130 is not set 1032# CONFIG_RTC_DRV_FM3130 is not set
989# CONFIG_RTC_DRV_RX8581 is not set 1033# CONFIG_RTC_DRV_RX8581 is not set
@@ -1005,7 +1049,9 @@ CONFIG_RTC_DRV_DS1307=y
1005# CONFIG_RTC_DRV_M48T86 is not set 1049# CONFIG_RTC_DRV_M48T86 is not set
1006# CONFIG_RTC_DRV_M48T35 is not set 1050# CONFIG_RTC_DRV_M48T35 is not set
1007# CONFIG_RTC_DRV_M48T59 is not set 1051# CONFIG_RTC_DRV_M48T59 is not set
1052# CONFIG_RTC_DRV_MSM6242 is not set
1008# CONFIG_RTC_DRV_BQ4802 is not set 1053# CONFIG_RTC_DRV_BQ4802 is not set
1054# CONFIG_RTC_DRV_RP5C01 is not set
1009# CONFIG_RTC_DRV_V3020 is not set 1055# CONFIG_RTC_DRV_V3020 is not set
1010 1056
1011# 1057#
@@ -1275,6 +1321,7 @@ CONFIG_DEBUG_INFO=y
1275# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1321# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1276# CONFIG_FAULT_INJECTION is not set 1322# CONFIG_FAULT_INJECTION is not set
1277# CONFIG_LATENCYTOP is not set 1323# CONFIG_LATENCYTOP is not set
1324# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1278# CONFIG_DEBUG_PAGEALLOC is not set 1325# CONFIG_DEBUG_PAGEALLOC is not set
1279CONFIG_HAVE_FUNCTION_TRACER=y 1326CONFIG_HAVE_FUNCTION_TRACER=y
1280CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1327CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1318,7 +1365,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1318# CONFIG_KEYS is not set 1365# CONFIG_KEYS is not set
1319# CONFIG_SECURITY is not set 1366# CONFIG_SECURITY is not set
1320# CONFIG_SECURITYFS is not set 1367# CONFIG_SECURITYFS is not set
1321# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1368# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1369# CONFIG_DEFAULT_SECURITY_SMACK is not set
1370# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1371CONFIG_DEFAULT_SECURITY_DAC=y
1372CONFIG_DEFAULT_SECURITY=""
1322CONFIG_CRYPTO=y 1373CONFIG_CRYPTO=y
1323 1374
1324# 1375#
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index 466f09ac3153..baa2bbb6c096 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:20 2009 4# Wed Jan 6 09:24:14 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -60,6 +61,7 @@ CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61# CONFIG_DEFAULT_UIMAGE is not set 62# CONFIG_DEFAULT_UIMAGE is not set
62CONFIG_REDBOOT=y 63CONFIG_REDBOOT=y
64CONFIG_ARCH_HIBERNATION_POSSIBLE=y
63CONFIG_ARCH_SUSPEND_POSSIBLE=y 65CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 66# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 67# CONFIG_PPC_DCR_MMIO is not set
@@ -88,6 +90,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 90#
89CONFIG_TREE_RCU=y 91CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 92# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 94# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 95CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 96# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 177# IO Schedulers
175# 178#
176CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
186 216
187# 217#
@@ -260,6 +290,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 290CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
261# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
262# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
293CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +307,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 310# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -530,6 +556,10 @@ CONFIG_BLK_DEV=y
530# CONFIG_BLK_DEV_COW_COMMON is not set 556# CONFIG_BLK_DEV_COW_COMMON is not set
531CONFIG_BLK_DEV_LOOP=y 557CONFIG_BLK_DEV_LOOP=y
532# CONFIG_BLK_DEV_CRYPTOLOOP is not set 558# CONFIG_BLK_DEV_CRYPTOLOOP is not set
559
560#
561# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
562#
533# CONFIG_BLK_DEV_NBD is not set 563# CONFIG_BLK_DEV_NBD is not set
534# CONFIG_BLK_DEV_SX8 is not set 564# CONFIG_BLK_DEV_SX8 is not set
535# CONFIG_BLK_DEV_UB is not set 565# CONFIG_BLK_DEV_UB is not set
@@ -541,6 +571,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
541# CONFIG_ATA_OVER_ETH is not set 571# CONFIG_ATA_OVER_ETH is not set
542# CONFIG_BLK_DEV_HD is not set 572# CONFIG_BLK_DEV_HD is not set
543CONFIG_MISC_DEVICES=y 573CONFIG_MISC_DEVICES=y
574# CONFIG_AD525X_DPOT is not set
544# CONFIG_PHANTOM is not set 575# CONFIG_PHANTOM is not set
545# CONFIG_SGI_IOC4 is not set 576# CONFIG_SGI_IOC4 is not set
546# CONFIG_TIFM_CORE is not set 577# CONFIG_TIFM_CORE is not set
@@ -548,6 +579,7 @@ CONFIG_MISC_DEVICES=y
548# CONFIG_ENCLOSURE_SERVICES is not set 579# CONFIG_ENCLOSURE_SERVICES is not set
549# CONFIG_HP_ILO is not set 580# CONFIG_HP_ILO is not set
550# CONFIG_ISL29003 is not set 581# CONFIG_ISL29003 is not set
582# CONFIG_DS1682 is not set
551# CONFIG_C2PORT is not set 583# CONFIG_C2PORT is not set
552 584
553# 585#
@@ -581,7 +613,7 @@ CONFIG_HAVE_IDE=y
581# 613#
582 614
583# 615#
584# See the help texts for more information. 616# The newer stack is recommended.
585# 617#
586# CONFIG_FIREWIRE is not set 618# CONFIG_FIREWIRE is not set
587# CONFIG_IEEE1394 is not set 619# CONFIG_IEEE1394 is not set
@@ -668,8 +700,11 @@ CONFIG_GIANFAR=y
668# CONFIG_NETDEV_10000 is not set 700# CONFIG_NETDEV_10000 is not set
669# CONFIG_TR is not set 701# CONFIG_TR is not set
670CONFIG_WLAN=y 702CONFIG_WLAN=y
671# CONFIG_WLAN_PRE80211 is not set 703# CONFIG_AIRO is not set
672# CONFIG_WLAN_80211 is not set 704# CONFIG_ATMEL is not set
705# CONFIG_PRISM54 is not set
706# CONFIG_USB_ZD1201 is not set
707# CONFIG_HOSTAP is not set
673 708
674# 709#
675# Enable WiMAX (Networking options) to see the WiMAX drivers 710# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -691,6 +726,7 @@ CONFIG_WLAN=y
691# CONFIG_NETCONSOLE is not set 726# CONFIG_NETCONSOLE is not set
692# CONFIG_NETPOLL is not set 727# CONFIG_NETPOLL is not set
693# CONFIG_NET_POLL_CONTROLLER is not set 728# CONFIG_NET_POLL_CONTROLLER is not set
729# CONFIG_VMXNET3 is not set
694# CONFIG_ISDN is not set 730# CONFIG_ISDN is not set
695# CONFIG_PHONE is not set 731# CONFIG_PHONE is not set
696 732
@@ -700,6 +736,7 @@ CONFIG_WLAN=y
700CONFIG_INPUT=y 736CONFIG_INPUT=y
701# CONFIG_INPUT_FF_MEMLESS is not set 737# CONFIG_INPUT_FF_MEMLESS is not set
702# CONFIG_INPUT_POLLDEV is not set 738# CONFIG_INPUT_POLLDEV is not set
739# CONFIG_INPUT_SPARSEKMAP is not set
703 740
704# 741#
705# Userland interfaces 742# Userland interfaces
@@ -751,6 +788,7 @@ CONFIG_SERIAL_CORE=y
751CONFIG_SERIAL_CORE_CONSOLE=y 788CONFIG_SERIAL_CORE_CONSOLE=y
752# CONFIG_SERIAL_JSM is not set 789# CONFIG_SERIAL_JSM is not set
753# CONFIG_SERIAL_OF_PLATFORM is not set 790# CONFIG_SERIAL_OF_PLATFORM is not set
791# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
754CONFIG_UNIX98_PTYS=y 792CONFIG_UNIX98_PTYS=y
755# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 793# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
756CONFIG_LEGACY_PTYS=y 794CONFIG_LEGACY_PTYS=y
@@ -807,11 +845,6 @@ CONFIG_I2C_MPC=y
807# CONFIG_I2C_TINY_USB is not set 845# CONFIG_I2C_TINY_USB is not set
808 846
809# 847#
810# Graphics adapter I2C/DDC channel drivers
811#
812# CONFIG_I2C_VOODOO3 is not set
813
814#
815# Other I2C/SMBus bus drivers 848# Other I2C/SMBus bus drivers
816# 849#
817# CONFIG_I2C_PCA_PLATFORM is not set 850# CONFIG_I2C_PCA_PLATFORM is not set
@@ -820,7 +853,6 @@ CONFIG_I2C_MPC=y
820# 853#
821# Miscellaneous I2C Chip support 854# Miscellaneous I2C Chip support
822# 855#
823# CONFIG_DS1682 is not set
824# CONFIG_SENSORS_TSL2550 is not set 856# CONFIG_SENSORS_TSL2550 is not set
825# CONFIG_I2C_DEBUG_CORE is not set 857# CONFIG_I2C_DEBUG_CORE is not set
826# CONFIG_I2C_DEBUG_ALGO is not set 858# CONFIG_I2C_DEBUG_ALGO is not set
@@ -866,6 +898,7 @@ CONFIG_HWMON=y
866# CONFIG_SENSORS_GL520SM is not set 898# CONFIG_SENSORS_GL520SM is not set
867# CONFIG_SENSORS_IT87 is not set 899# CONFIG_SENSORS_IT87 is not set
868# CONFIG_SENSORS_LM63 is not set 900# CONFIG_SENSORS_LM63 is not set
901# CONFIG_SENSORS_LM73 is not set
869# CONFIG_SENSORS_LM75 is not set 902# CONFIG_SENSORS_LM75 is not set
870# CONFIG_SENSORS_LM77 is not set 903# CONFIG_SENSORS_LM77 is not set
871# CONFIG_SENSORS_LM78 is not set 904# CONFIG_SENSORS_LM78 is not set
@@ -904,6 +937,7 @@ CONFIG_HWMON=y
904# CONFIG_SENSORS_W83L786NG is not set 937# CONFIG_SENSORS_W83L786NG is not set
905# CONFIG_SENSORS_W83627HF is not set 938# CONFIG_SENSORS_W83627HF is not set
906# CONFIG_SENSORS_W83627EHF is not set 939# CONFIG_SENSORS_W83627EHF is not set
940# CONFIG_SENSORS_LIS3_I2C is not set
907CONFIG_THERMAL=y 941CONFIG_THERMAL=y
908# CONFIG_THERMAL_HWMON is not set 942# CONFIG_THERMAL_HWMON is not set
909CONFIG_WATCHDOG=y 943CONFIG_WATCHDOG=y
@@ -942,11 +976,13 @@ CONFIG_SSB_POSSIBLE=y
942# CONFIG_TWL4030_CORE is not set 976# CONFIG_TWL4030_CORE is not set
943# CONFIG_MFD_TMIO is not set 977# CONFIG_MFD_TMIO is not set
944# CONFIG_PMIC_DA903X is not set 978# CONFIG_PMIC_DA903X is not set
979# CONFIG_PMIC_ADP5520 is not set
945# CONFIG_MFD_WM8400 is not set 980# CONFIG_MFD_WM8400 is not set
946# CONFIG_MFD_WM831X is not set 981# CONFIG_MFD_WM831X is not set
947# CONFIG_MFD_WM8350_I2C is not set 982# CONFIG_MFD_WM8350_I2C is not set
948# CONFIG_MFD_PCF50633 is not set 983# CONFIG_MFD_PCF50633 is not set
949# CONFIG_AB3100_CORE is not set 984# CONFIG_AB3100_CORE is not set
985# CONFIG_MFD_88PM8607 is not set
950# CONFIG_REGULATOR is not set 986# CONFIG_REGULATOR is not set
951# CONFIG_MEDIA_SUPPORT is not set 987# CONFIG_MEDIA_SUPPORT is not set
952 988
@@ -996,6 +1032,7 @@ CONFIG_USB_MON=y
996CONFIG_USB_EHCI_HCD=y 1032CONFIG_USB_EHCI_HCD=y
997CONFIG_USB_EHCI_ROOT_HUB_TT=y 1033CONFIG_USB_EHCI_ROOT_HUB_TT=y
998# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1034# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1035# CONFIG_XPS_USB_HCD_XILINX is not set
999CONFIG_USB_EHCI_FSL=y 1036CONFIG_USB_EHCI_FSL=y
1000CONFIG_USB_EHCI_HCD_PPC_OF=y 1037CONFIG_USB_EHCI_HCD_PPC_OF=y
1001# CONFIG_USB_OXU210HP_HCD is not set 1038# CONFIG_USB_OXU210HP_HCD is not set
@@ -1101,6 +1138,7 @@ CONFIG_RTC_DRV_DS1374=y
1101# CONFIG_RTC_DRV_PCF8563 is not set 1138# CONFIG_RTC_DRV_PCF8563 is not set
1102# CONFIG_RTC_DRV_PCF8583 is not set 1139# CONFIG_RTC_DRV_PCF8583 is not set
1103# CONFIG_RTC_DRV_M41T80 is not set 1140# CONFIG_RTC_DRV_M41T80 is not set
1141# CONFIG_RTC_DRV_BQ32K is not set
1104# CONFIG_RTC_DRV_S35390A is not set 1142# CONFIG_RTC_DRV_S35390A is not set
1105# CONFIG_RTC_DRV_FM3130 is not set 1143# CONFIG_RTC_DRV_FM3130 is not set
1106# CONFIG_RTC_DRV_RX8581 is not set 1144# CONFIG_RTC_DRV_RX8581 is not set
@@ -1122,7 +1160,9 @@ CONFIG_RTC_DRV_DS1374=y
1122# CONFIG_RTC_DRV_M48T86 is not set 1160# CONFIG_RTC_DRV_M48T86 is not set
1123# CONFIG_RTC_DRV_M48T35 is not set 1161# CONFIG_RTC_DRV_M48T35 is not set
1124# CONFIG_RTC_DRV_M48T59 is not set 1162# CONFIG_RTC_DRV_M48T59 is not set
1163# CONFIG_RTC_DRV_MSM6242 is not set
1125# CONFIG_RTC_DRV_BQ4802 is not set 1164# CONFIG_RTC_DRV_BQ4802 is not set
1165# CONFIG_RTC_DRV_RP5C01 is not set
1126# CONFIG_RTC_DRV_V3020 is not set 1166# CONFIG_RTC_DRV_V3020 is not set
1127 1167
1128# 1168#
@@ -1347,7 +1387,7 @@ CONFIG_FRAME_WARN=1024
1347# CONFIG_DEBUG_KERNEL is not set 1387# CONFIG_DEBUG_KERNEL is not set
1348# CONFIG_SLUB_DEBUG_ON is not set 1388# CONFIG_SLUB_DEBUG_ON is not set
1349# CONFIG_SLUB_STATS is not set 1389# CONFIG_SLUB_STATS is not set
1350# CONFIG_DEBUG_BUGVERBOSE is not set 1390CONFIG_DEBUG_BUGVERBOSE=y
1351# CONFIG_DEBUG_MEMORY_INIT is not set 1391# CONFIG_DEBUG_MEMORY_INIT is not set
1352# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1392# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1353# CONFIG_LATENCYTOP is not set 1393# CONFIG_LATENCYTOP is not set
@@ -1374,7 +1414,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1374# CONFIG_KEYS is not set 1414# CONFIG_KEYS is not set
1375# CONFIG_SECURITY is not set 1415# CONFIG_SECURITY is not set
1376# CONFIG_SECURITYFS is not set 1416# CONFIG_SECURITYFS is not set
1377# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1417# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1418# CONFIG_DEFAULT_SECURITY_SMACK is not set
1419# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1420CONFIG_DEFAULT_SECURITY_DAC=y
1421CONFIG_DEFAULT_SECURITY=""
1378CONFIG_CRYPTO=y 1422CONFIG_CRYPTO=y
1379 1423
1380# 1424#
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index 6694fb73cd99..8b1aa806e548 100644
--- a/arch/powerpc/configs/83xx/kmeter1_defconfig
+++ b/arch/powerpc/configs/83xx/kmeter1_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:21 2009 4# Wed Jan 6 09:24:14 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -89,6 +91,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
89# 91#
90CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -168,14 +171,41 @@ CONFIG_LBDAF=y
168# IO Schedulers 171# IO Schedulers
169# 172#
170CONFIG_IOSCHED_NOOP=y 173CONFIG_IOSCHED_NOOP=y
171# CONFIG_IOSCHED_AS is not set
172# CONFIG_IOSCHED_DEADLINE is not set 174# CONFIG_IOSCHED_DEADLINE is not set
173# CONFIG_IOSCHED_CFQ is not set 175# CONFIG_IOSCHED_CFQ is not set
174# CONFIG_DEFAULT_AS is not set
175# CONFIG_DEFAULT_DEADLINE is not set 176# CONFIG_DEFAULT_DEADLINE is not set
176# CONFIG_DEFAULT_CFQ is not set 177# CONFIG_DEFAULT_CFQ is not set
177CONFIG_DEFAULT_NOOP=y 178CONFIG_DEFAULT_NOOP=y
178CONFIG_DEFAULT_IOSCHED="noop" 179CONFIG_DEFAULT_IOSCHED="noop"
180# CONFIG_INLINE_SPIN_TRYLOCK is not set
181# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
182# CONFIG_INLINE_SPIN_LOCK is not set
183# CONFIG_INLINE_SPIN_LOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
185# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
186# CONFIG_INLINE_SPIN_UNLOCK is not set
187# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
188# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
190# CONFIG_INLINE_READ_TRYLOCK is not set
191# CONFIG_INLINE_READ_LOCK is not set
192# CONFIG_INLINE_READ_LOCK_BH is not set
193# CONFIG_INLINE_READ_LOCK_IRQ is not set
194# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
195# CONFIG_INLINE_READ_UNLOCK is not set
196# CONFIG_INLINE_READ_UNLOCK_BH is not set
197# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
198# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
199# CONFIG_INLINE_WRITE_TRYLOCK is not set
200# CONFIG_INLINE_WRITE_LOCK is not set
201# CONFIG_INLINE_WRITE_LOCK_BH is not set
202# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
203# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
204# CONFIG_INLINE_WRITE_UNLOCK is not set
205# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
206# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
208# CONFIG_MUTEX_SPIN_ON_OWNER is not set
179# CONFIG_FREEZER is not set 209# CONFIG_FREEZER is not set
180 210
181# 211#
@@ -253,6 +283,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
254# CONFIG_KEXEC is not set 284# CONFIG_KEXEC is not set
255# CONFIG_CRASH_DUMP is not set 285# CONFIG_CRASH_DUMP is not set
286CONFIG_SPARSE_IRQ=y
256CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
257CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
258CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -269,8 +300,6 @@ CONFIG_MIGRATION=y
269CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
270CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
271CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
272CONFIG_HAVE_MLOCK=y
273CONFIG_HAVE_MLOCKED_PAGE_BIT=y
274# CONFIG_KSM is not set 303# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -384,7 +413,13 @@ CONFIG_LLC=m
384# CONFIG_IRDA is not set 413# CONFIG_IRDA is not set
385# CONFIG_BT is not set 414# CONFIG_BT is not set
386# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
387# CONFIG_WIRELESS is not set 416CONFIG_WIRELESS=y
417# CONFIG_CFG80211 is not set
418# CONFIG_LIB80211 is not set
419
420#
421# CFG80211 needs to be enabled for MAC80211
422#
388# CONFIG_WIMAX is not set 423# CONFIG_WIMAX is not set
389# CONFIG_RFKILL is not set 424# CONFIG_RFKILL is not set
390# CONFIG_NET_9P is not set 425# CONFIG_NET_9P is not set
@@ -512,6 +547,10 @@ CONFIG_BLK_DEV=y
512# CONFIG_BLK_DEV_FD is not set 547# CONFIG_BLK_DEV_FD is not set
513# CONFIG_BLK_DEV_COW_COMMON is not set 548# CONFIG_BLK_DEV_COW_COMMON is not set
514# CONFIG_BLK_DEV_LOOP is not set 549# CONFIG_BLK_DEV_LOOP is not set
550
551#
552# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
553#
515# CONFIG_BLK_DEV_NBD is not set 554# CONFIG_BLK_DEV_NBD is not set
516# CONFIG_BLK_DEV_RAM is not set 555# CONFIG_BLK_DEV_RAM is not set
517# CONFIG_CDROM_PKTCDVD is not set 556# CONFIG_CDROM_PKTCDVD is not set
@@ -581,8 +620,7 @@ CONFIG_UCC_GETH=y
581# CONFIG_MV643XX_ETH is not set 620# CONFIG_MV643XX_ETH is not set
582# CONFIG_NETDEV_10000 is not set 621# CONFIG_NETDEV_10000 is not set
583CONFIG_WLAN=y 622CONFIG_WLAN=y
584# CONFIG_WLAN_PRE80211 is not set 623# CONFIG_HOSTAP is not set
585# CONFIG_WLAN_80211 is not set
586 624
587# 625#
588# Enable WiMAX (Networking options) to see the WiMAX drivers 626# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -652,6 +690,7 @@ CONFIG_SERIAL_CORE=y
652CONFIG_SERIAL_CORE_CONSOLE=y 690CONFIG_SERIAL_CORE_CONSOLE=y
653# CONFIG_SERIAL_OF_PLATFORM is not set 691# CONFIG_SERIAL_OF_PLATFORM is not set
654# CONFIG_SERIAL_QE is not set 692# CONFIG_SERIAL_QE is not set
693# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
655CONFIG_UNIX98_PTYS=y 694CONFIG_UNIX98_PTYS=y
656# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 695# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
657CONFIG_LEGACY_PTYS=y 696CONFIG_LEGACY_PTYS=y
@@ -697,7 +736,6 @@ CONFIG_I2C_MPC=y
697# 736#
698# Miscellaneous I2C Chip support 737# Miscellaneous I2C Chip support
699# 738#
700# CONFIG_DS1682 is not set
701# CONFIG_SENSORS_TSL2550 is not set 739# CONFIG_SENSORS_TSL2550 is not set
702# CONFIG_I2C_DEBUG_CORE is not set 740# CONFIG_I2C_DEBUG_CORE is not set
703# CONFIG_I2C_DEBUG_ALGO is not set 741# CONFIG_I2C_DEBUG_ALGO is not set
@@ -732,11 +770,13 @@ CONFIG_SSB_POSSIBLE=y
732# CONFIG_TWL4030_CORE is not set 770# CONFIG_TWL4030_CORE is not set
733# CONFIG_MFD_TMIO is not set 771# CONFIG_MFD_TMIO is not set
734# CONFIG_PMIC_DA903X is not set 772# CONFIG_PMIC_DA903X is not set
773# CONFIG_PMIC_ADP5520 is not set
735# CONFIG_MFD_WM8400 is not set 774# CONFIG_MFD_WM8400 is not set
736# CONFIG_MFD_WM831X is not set 775# CONFIG_MFD_WM831X is not set
737# CONFIG_MFD_WM8350_I2C is not set 776# CONFIG_MFD_WM8350_I2C is not set
738# CONFIG_MFD_PCF50633 is not set 777# CONFIG_MFD_PCF50633 is not set
739# CONFIG_AB3100_CORE is not set 778# CONFIG_AB3100_CORE is not set
779# CONFIG_MFD_88PM8607 is not set
740# CONFIG_REGULATOR is not set 780# CONFIG_REGULATOR is not set
741# CONFIG_MEDIA_SUPPORT is not set 781# CONFIG_MEDIA_SUPPORT is not set
742 782
@@ -933,7 +973,7 @@ CONFIG_FRAME_WARN=1024
933CONFIG_DEBUG_FS=y 973CONFIG_DEBUG_FS=y
934# CONFIG_HEADERS_CHECK is not set 974# CONFIG_HEADERS_CHECK is not set
935# CONFIG_DEBUG_KERNEL is not set 975# CONFIG_DEBUG_KERNEL is not set
936# CONFIG_DEBUG_BUGVERBOSE is not set 976CONFIG_DEBUG_BUGVERBOSE=y
937# CONFIG_DEBUG_MEMORY_INIT is not set 977# CONFIG_DEBUG_MEMORY_INIT is not set
938# CONFIG_RCU_CPU_STALL_DETECTOR is not set 978# CONFIG_RCU_CPU_STALL_DETECTOR is not set
939# CONFIG_LATENCYTOP is not set 979# CONFIG_LATENCYTOP is not set
@@ -963,7 +1003,11 @@ CONFIG_PRINT_STACK_DEPTH=64
963# CONFIG_KEYS is not set 1003# CONFIG_KEYS is not set
964# CONFIG_SECURITY is not set 1004# CONFIG_SECURITY is not set
965# CONFIG_SECURITYFS is not set 1005# CONFIG_SECURITYFS is not set
966# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1006# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1007# CONFIG_DEFAULT_SECURITY_SMACK is not set
1008# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1009CONFIG_DEFAULT_SECURITY_DAC=y
1010CONFIG_DEFAULT_SECURITY=""
967# CONFIG_CRYPTO is not set 1011# CONFIG_CRYPTO is not set
968# CONFIG_PPC_CLOCK is not set 1012# CONFIG_PPC_CLOCK is not set
969CONFIG_PPC_LIB_RHEAP=y 1013CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 86df19f041a4..2f2d98558e44 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:22 2009 4# Wed Jan 6 09:24:15 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -544,6 +570,10 @@ CONFIG_BLK_DEV=y
544# CONFIG_BLK_DEV_COW_COMMON is not set 570# CONFIG_BLK_DEV_COW_COMMON is not set
545CONFIG_BLK_DEV_LOOP=y 571CONFIG_BLK_DEV_LOOP=y
546# CONFIG_BLK_DEV_CRYPTOLOOP is not set 572# CONFIG_BLK_DEV_CRYPTOLOOP is not set
573
574#
575# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
576#
547# CONFIG_BLK_DEV_NBD is not set 577# CONFIG_BLK_DEV_NBD is not set
548# CONFIG_BLK_DEV_SX8 is not set 578# CONFIG_BLK_DEV_SX8 is not set
549# CONFIG_BLK_DEV_UB is not set 579# CONFIG_BLK_DEV_UB is not set
@@ -555,6 +585,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
555# CONFIG_ATA_OVER_ETH is not set 585# CONFIG_ATA_OVER_ETH is not set
556# CONFIG_BLK_DEV_HD is not set 586# CONFIG_BLK_DEV_HD is not set
557CONFIG_MISC_DEVICES=y 587CONFIG_MISC_DEVICES=y
588# CONFIG_AD525X_DPOT is not set
558# CONFIG_PHANTOM is not set 589# CONFIG_PHANTOM is not set
559# CONFIG_SGI_IOC4 is not set 590# CONFIG_SGI_IOC4 is not set
560# CONFIG_TIFM_CORE is not set 591# CONFIG_TIFM_CORE is not set
@@ -562,6 +593,8 @@ CONFIG_MISC_DEVICES=y
562# CONFIG_ENCLOSURE_SERVICES is not set 593# CONFIG_ENCLOSURE_SERVICES is not set
563# CONFIG_HP_ILO is not set 594# CONFIG_HP_ILO is not set
564# CONFIG_ISL29003 is not set 595# CONFIG_ISL29003 is not set
596# CONFIG_DS1682 is not set
597# CONFIG_TI_DAC7512 is not set
565# CONFIG_C2PORT is not set 598# CONFIG_C2PORT is not set
566 599
567# 600#
@@ -615,7 +648,9 @@ CONFIG_SCSI_LOWLEVEL=y
615# CONFIG_SCSI_BNX2_ISCSI is not set 648# CONFIG_SCSI_BNX2_ISCSI is not set
616# CONFIG_BE2ISCSI is not set 649# CONFIG_BE2ISCSI is not set
617# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 650# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
651# CONFIG_SCSI_HPSA is not set
618# CONFIG_SCSI_3W_9XXX is not set 652# CONFIG_SCSI_3W_9XXX is not set
653# CONFIG_SCSI_3W_SAS is not set
619# CONFIG_SCSI_ACARD is not set 654# CONFIG_SCSI_ACARD is not set
620# CONFIG_SCSI_AACRAID is not set 655# CONFIG_SCSI_AACRAID is not set
621# CONFIG_SCSI_AIC7XXX is not set 656# CONFIG_SCSI_AIC7XXX is not set
@@ -653,6 +688,7 @@ CONFIG_SCSI_LOWLEVEL=y
653# CONFIG_SCSI_NSP32 is not set 688# CONFIG_SCSI_NSP32 is not set
654# CONFIG_SCSI_DEBUG is not set 689# CONFIG_SCSI_DEBUG is not set
655# CONFIG_SCSI_PMCRAID is not set 690# CONFIG_SCSI_PMCRAID is not set
691# CONFIG_SCSI_PM8001 is not set
656# CONFIG_SCSI_SRP is not set 692# CONFIG_SCSI_SRP is not set
657# CONFIG_SCSI_BFA_FC is not set 693# CONFIG_SCSI_BFA_FC is not set
658# CONFIG_SCSI_DH is not set 694# CONFIG_SCSI_DH is not set
@@ -680,7 +716,7 @@ CONFIG_MD_RAID1=y
680# 716#
681 717
682# 718#
683# See the help texts for more information. 719# The newer stack is recommended.
684# 720#
685# CONFIG_FIREWIRE is not set 721# CONFIG_FIREWIRE is not set
686# CONFIG_IEEE1394 is not set 722# CONFIG_IEEE1394 is not set
@@ -805,8 +841,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
805# CONFIG_BE2NET is not set 841# CONFIG_BE2NET is not set
806# CONFIG_TR is not set 842# CONFIG_TR is not set
807CONFIG_WLAN=y 843CONFIG_WLAN=y
808# CONFIG_WLAN_PRE80211 is not set 844# CONFIG_AIRO is not set
809# CONFIG_WLAN_80211 is not set 845# CONFIG_ATMEL is not set
846# CONFIG_PRISM54 is not set
847# CONFIG_USB_ZD1201 is not set
848# CONFIG_HOSTAP is not set
810 849
811# 850#
812# Enable WiMAX (Networking options) to see the WiMAX drivers 851# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -829,6 +868,7 @@ CONFIG_WLAN=y
829# CONFIG_NETCONSOLE is not set 868# CONFIG_NETCONSOLE is not set
830# CONFIG_NETPOLL is not set 869# CONFIG_NETPOLL is not set
831# CONFIG_NET_POLL_CONTROLLER is not set 870# CONFIG_NET_POLL_CONTROLLER is not set
871# CONFIG_VMXNET3 is not set
832# CONFIG_ISDN is not set 872# CONFIG_ISDN is not set
833# CONFIG_PHONE is not set 873# CONFIG_PHONE is not set
834 874
@@ -838,6 +878,7 @@ CONFIG_WLAN=y
838CONFIG_INPUT=y 878CONFIG_INPUT=y
839# CONFIG_INPUT_FF_MEMLESS is not set 879# CONFIG_INPUT_FF_MEMLESS is not set
840# CONFIG_INPUT_POLLDEV is not set 880# CONFIG_INPUT_POLLDEV is not set
881# CONFIG_INPUT_SPARSEKMAP is not set
841 882
842# 883#
843# Userland interfaces 884# Userland interfaces
@@ -890,6 +931,7 @@ CONFIG_SERIAL_CORE=y
890CONFIG_SERIAL_CORE_CONSOLE=y 931CONFIG_SERIAL_CORE_CONSOLE=y
891# CONFIG_SERIAL_JSM is not set 932# CONFIG_SERIAL_JSM is not set
892# CONFIG_SERIAL_OF_PLATFORM is not set 933# CONFIG_SERIAL_OF_PLATFORM is not set
934# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
893CONFIG_UNIX98_PTYS=y 935CONFIG_UNIX98_PTYS=y
894# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 936# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
895CONFIG_LEGACY_PTYS=y 937CONFIG_LEGACY_PTYS=y
@@ -947,11 +989,6 @@ CONFIG_I2C_MPC=y
947# CONFIG_I2C_TINY_USB is not set 989# CONFIG_I2C_TINY_USB is not set
948 990
949# 991#
950# Graphics adapter I2C/DDC channel drivers
951#
952# CONFIG_I2C_VOODOO3 is not set
953
954#
955# Other I2C/SMBus bus drivers 992# Other I2C/SMBus bus drivers
956# 993#
957# CONFIG_I2C_PCA_PLATFORM is not set 994# CONFIG_I2C_PCA_PLATFORM is not set
@@ -960,7 +997,6 @@ CONFIG_I2C_MPC=y
960# 997#
961# Miscellaneous I2C Chip support 998# Miscellaneous I2C Chip support
962# 999#
963# CONFIG_DS1682 is not set
964# CONFIG_SENSORS_TSL2550 is not set 1000# CONFIG_SENSORS_TSL2550 is not set
965# CONFIG_I2C_DEBUG_CORE is not set 1001# CONFIG_I2C_DEBUG_CORE is not set
966# CONFIG_I2C_DEBUG_ALGO is not set 1002# CONFIG_I2C_DEBUG_ALGO is not set
@@ -975,6 +1011,8 @@ CONFIG_SPI_MASTER=y
975# 1011#
976CONFIG_SPI_BITBANG=y 1012CONFIG_SPI_BITBANG=y
977# CONFIG_SPI_MPC8xxx is not set 1013# CONFIG_SPI_MPC8xxx is not set
1014# CONFIG_SPI_XILINX is not set
1015# CONFIG_SPI_DESIGNWARE is not set
978 1016
979# 1017#
980# SPI Protocol Masters 1018# SPI Protocol Masters
@@ -1022,6 +1060,7 @@ CONFIG_HWMON=y
1022# CONFIG_SENSORS_IT87 is not set 1060# CONFIG_SENSORS_IT87 is not set
1023# CONFIG_SENSORS_LM63 is not set 1061# CONFIG_SENSORS_LM63 is not set
1024# CONFIG_SENSORS_LM70 is not set 1062# CONFIG_SENSORS_LM70 is not set
1063# CONFIG_SENSORS_LM73 is not set
1025# CONFIG_SENSORS_LM75 is not set 1064# CONFIG_SENSORS_LM75 is not set
1026# CONFIG_SENSORS_LM77 is not set 1065# CONFIG_SENSORS_LM77 is not set
1027# CONFIG_SENSORS_LM78 is not set 1066# CONFIG_SENSORS_LM78 is not set
@@ -1062,6 +1101,7 @@ CONFIG_HWMON=y
1062# CONFIG_SENSORS_W83627HF is not set 1101# CONFIG_SENSORS_W83627HF is not set
1063# CONFIG_SENSORS_W83627EHF is not set 1102# CONFIG_SENSORS_W83627EHF is not set
1064# CONFIG_SENSORS_LIS3_SPI is not set 1103# CONFIG_SENSORS_LIS3_SPI is not set
1104# CONFIG_SENSORS_LIS3_I2C is not set
1065# CONFIG_THERMAL is not set 1105# CONFIG_THERMAL is not set
1066CONFIG_WATCHDOG=y 1106CONFIG_WATCHDOG=y
1067# CONFIG_WATCHDOG_NOWAYOUT is not set 1107# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1099,6 +1139,7 @@ CONFIG_SSB_POSSIBLE=y
1099# CONFIG_TWL4030_CORE is not set 1139# CONFIG_TWL4030_CORE is not set
1100# CONFIG_MFD_TMIO is not set 1140# CONFIG_MFD_TMIO is not set
1101# CONFIG_PMIC_DA903X is not set 1141# CONFIG_PMIC_DA903X is not set
1142# CONFIG_PMIC_ADP5520 is not set
1102# CONFIG_MFD_WM8400 is not set 1143# CONFIG_MFD_WM8400 is not set
1103# CONFIG_MFD_WM831X is not set 1144# CONFIG_MFD_WM831X is not set
1104# CONFIG_MFD_WM8350_I2C is not set 1145# CONFIG_MFD_WM8350_I2C is not set
@@ -1106,6 +1147,8 @@ CONFIG_SSB_POSSIBLE=y
1106# CONFIG_MFD_MC13783 is not set 1147# CONFIG_MFD_MC13783 is not set
1107# CONFIG_AB3100_CORE is not set 1148# CONFIG_AB3100_CORE is not set
1108# CONFIG_EZX_PCAP is not set 1149# CONFIG_EZX_PCAP is not set
1150# CONFIG_MFD_88PM8607 is not set
1151# CONFIG_AB4500_CORE is not set
1109# CONFIG_REGULATOR is not set 1152# CONFIG_REGULATOR is not set
1110# CONFIG_MEDIA_SUPPORT is not set 1153# CONFIG_MEDIA_SUPPORT is not set
1111 1154
@@ -1173,6 +1216,7 @@ CONFIG_USB_MON=y
1173CONFIG_USB_EHCI_HCD=y 1216CONFIG_USB_EHCI_HCD=y
1174CONFIG_USB_EHCI_ROOT_HUB_TT=y 1217CONFIG_USB_EHCI_ROOT_HUB_TT=y
1175# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1218# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1219# CONFIG_XPS_USB_HCD_XILINX is not set
1176CONFIG_USB_EHCI_FSL=y 1220CONFIG_USB_EHCI_FSL=y
1177CONFIG_USB_EHCI_HCD_PPC_OF=y 1221CONFIG_USB_EHCI_HCD_PPC_OF=y
1178# CONFIG_USB_OXU210HP_HCD is not set 1222# CONFIG_USB_OXU210HP_HCD is not set
@@ -1287,15 +1331,17 @@ CONFIG_USB_NET2280=y
1287CONFIG_USB_GADGET_DUALSPEED=y 1331CONFIG_USB_GADGET_DUALSPEED=y
1288# CONFIG_USB_ZERO is not set 1332# CONFIG_USB_ZERO is not set
1289# CONFIG_USB_AUDIO is not set 1333# CONFIG_USB_AUDIO is not set
1290CONFIG_USB_ETH=y 1334CONFIG_USB_ETH=m
1291CONFIG_USB_ETH_RNDIS=y 1335CONFIG_USB_ETH_RNDIS=y
1292# CONFIG_USB_ETH_EEM is not set 1336# CONFIG_USB_ETH_EEM is not set
1293# CONFIG_USB_GADGETFS is not set 1337# CONFIG_USB_GADGETFS is not set
1294# CONFIG_USB_FILE_STORAGE is not set 1338# CONFIG_USB_FILE_STORAGE is not set
1339# CONFIG_USB_MASS_STORAGE is not set
1295# CONFIG_USB_G_SERIAL is not set 1340# CONFIG_USB_G_SERIAL is not set
1296# CONFIG_USB_MIDI_GADGET is not set 1341# CONFIG_USB_MIDI_GADGET is not set
1297# CONFIG_USB_G_PRINTER is not set 1342# CONFIG_USB_G_PRINTER is not set
1298# CONFIG_USB_CDC_COMPOSITE is not set 1343# CONFIG_USB_CDC_COMPOSITE is not set
1344# CONFIG_USB_G_MULTI is not set
1299 1345
1300# 1346#
1301# OTG and related infrastructure 1347# OTG and related infrastructure
@@ -1336,6 +1382,7 @@ CONFIG_RTC_DRV_DS1307=y
1336# CONFIG_RTC_DRV_PCF8563 is not set 1382# CONFIG_RTC_DRV_PCF8563 is not set
1337# CONFIG_RTC_DRV_PCF8583 is not set 1383# CONFIG_RTC_DRV_PCF8583 is not set
1338# CONFIG_RTC_DRV_M41T80 is not set 1384# CONFIG_RTC_DRV_M41T80 is not set
1385# CONFIG_RTC_DRV_BQ32K is not set
1339# CONFIG_RTC_DRV_S35390A is not set 1386# CONFIG_RTC_DRV_S35390A is not set
1340# CONFIG_RTC_DRV_FM3130 is not set 1387# CONFIG_RTC_DRV_FM3130 is not set
1341# CONFIG_RTC_DRV_RX8581 is not set 1388# CONFIG_RTC_DRV_RX8581 is not set
@@ -1365,7 +1412,9 @@ CONFIG_RTC_DRV_DS1307=y
1365# CONFIG_RTC_DRV_M48T86 is not set 1412# CONFIG_RTC_DRV_M48T86 is not set
1366# CONFIG_RTC_DRV_M48T35 is not set 1413# CONFIG_RTC_DRV_M48T35 is not set
1367# CONFIG_RTC_DRV_M48T59 is not set 1414# CONFIG_RTC_DRV_M48T59 is not set
1415# CONFIG_RTC_DRV_MSM6242 is not set
1368# CONFIG_RTC_DRV_BQ4802 is not set 1416# CONFIG_RTC_DRV_BQ4802 is not set
1417# CONFIG_RTC_DRV_RP5C01 is not set
1369# CONFIG_RTC_DRV_V3020 is not set 1418# CONFIG_RTC_DRV_V3020 is not set
1370 1419
1371# 1420#
@@ -1676,7 +1725,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1676# CONFIG_KEYS is not set 1725# CONFIG_KEYS is not set
1677# CONFIG_SECURITY is not set 1726# CONFIG_SECURITY is not set
1678# CONFIG_SECURITYFS is not set 1727# CONFIG_SECURITYFS is not set
1679# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1728# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1729# CONFIG_DEFAULT_SECURITY_SMACK is not set
1730# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1731CONFIG_DEFAULT_SECURITY_DAC=y
1732CONFIG_DEFAULT_SECURITY=""
1680CONFIG_CRYPTO=y 1733CONFIG_CRYPTO=y
1681 1734
1682# 1735#
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index 7bf71d577033..633e61194603 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:23 2009 4# Wed Jan 6 09:24:16 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -544,6 +570,10 @@ CONFIG_BLK_DEV=y
544# CONFIG_BLK_DEV_COW_COMMON is not set 570# CONFIG_BLK_DEV_COW_COMMON is not set
545CONFIG_BLK_DEV_LOOP=y 571CONFIG_BLK_DEV_LOOP=y
546# CONFIG_BLK_DEV_CRYPTOLOOP is not set 572# CONFIG_BLK_DEV_CRYPTOLOOP is not set
573
574#
575# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
576#
547# CONFIG_BLK_DEV_NBD is not set 577# CONFIG_BLK_DEV_NBD is not set
548# CONFIG_BLK_DEV_SX8 is not set 578# CONFIG_BLK_DEV_SX8 is not set
549# CONFIG_BLK_DEV_UB is not set 579# CONFIG_BLK_DEV_UB is not set
@@ -555,6 +585,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
555# CONFIG_ATA_OVER_ETH is not set 585# CONFIG_ATA_OVER_ETH is not set
556# CONFIG_BLK_DEV_HD is not set 586# CONFIG_BLK_DEV_HD is not set
557CONFIG_MISC_DEVICES=y 587CONFIG_MISC_DEVICES=y
588# CONFIG_AD525X_DPOT is not set
558# CONFIG_PHANTOM is not set 589# CONFIG_PHANTOM is not set
559# CONFIG_SGI_IOC4 is not set 590# CONFIG_SGI_IOC4 is not set
560# CONFIG_TIFM_CORE is not set 591# CONFIG_TIFM_CORE is not set
@@ -562,6 +593,8 @@ CONFIG_MISC_DEVICES=y
562# CONFIG_ENCLOSURE_SERVICES is not set 593# CONFIG_ENCLOSURE_SERVICES is not set
563# CONFIG_HP_ILO is not set 594# CONFIG_HP_ILO is not set
564# CONFIG_ISL29003 is not set 595# CONFIG_ISL29003 is not set
596# CONFIG_DS1682 is not set
597# CONFIG_TI_DAC7512 is not set
565# CONFIG_C2PORT is not set 598# CONFIG_C2PORT is not set
566 599
567# 600#
@@ -615,7 +648,9 @@ CONFIG_SCSI_LOWLEVEL=y
615# CONFIG_SCSI_BNX2_ISCSI is not set 648# CONFIG_SCSI_BNX2_ISCSI is not set
616# CONFIG_BE2ISCSI is not set 649# CONFIG_BE2ISCSI is not set
617# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 650# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
651# CONFIG_SCSI_HPSA is not set
618# CONFIG_SCSI_3W_9XXX is not set 652# CONFIG_SCSI_3W_9XXX is not set
653# CONFIG_SCSI_3W_SAS is not set
619# CONFIG_SCSI_ACARD is not set 654# CONFIG_SCSI_ACARD is not set
620# CONFIG_SCSI_AACRAID is not set 655# CONFIG_SCSI_AACRAID is not set
621# CONFIG_SCSI_AIC7XXX is not set 656# CONFIG_SCSI_AIC7XXX is not set
@@ -654,6 +689,7 @@ CONFIG_SCSI_LOWLEVEL=y
654# CONFIG_SCSI_NSP32 is not set 689# CONFIG_SCSI_NSP32 is not set
655# CONFIG_SCSI_DEBUG is not set 690# CONFIG_SCSI_DEBUG is not set
656# CONFIG_SCSI_PMCRAID is not set 691# CONFIG_SCSI_PMCRAID is not set
692# CONFIG_SCSI_PM8001 is not set
657# CONFIG_SCSI_SRP is not set 693# CONFIG_SCSI_SRP is not set
658# CONFIG_SCSI_BFA_FC is not set 694# CONFIG_SCSI_BFA_FC is not set
659# CONFIG_SCSI_DH is not set 695# CONFIG_SCSI_DH is not set
@@ -709,15 +745,16 @@ CONFIG_ATA_SFF=y
709# CONFIG_PATA_NS87415 is not set 745# CONFIG_PATA_NS87415 is not set
710# CONFIG_PATA_OPTI is not set 746# CONFIG_PATA_OPTI is not set
711# CONFIG_PATA_OPTIDMA is not set 747# CONFIG_PATA_OPTIDMA is not set
748# CONFIG_PATA_PDC2027X is not set
712# CONFIG_PATA_PDC_OLD is not set 749# CONFIG_PATA_PDC_OLD is not set
713# CONFIG_PATA_RADISYS is not set 750# CONFIG_PATA_RADISYS is not set
714# CONFIG_PATA_RDC is not set 751# CONFIG_PATA_RDC is not set
715# CONFIG_PATA_RZ1000 is not set 752# CONFIG_PATA_RZ1000 is not set
716# CONFIG_PATA_SC1200 is not set 753# CONFIG_PATA_SC1200 is not set
717# CONFIG_PATA_SERVERWORKS is not set 754# CONFIG_PATA_SERVERWORKS is not set
718# CONFIG_PATA_PDC2027X is not set
719# CONFIG_PATA_SIL680 is not set 755# CONFIG_PATA_SIL680 is not set
720# CONFIG_PATA_SIS is not set 756# CONFIG_PATA_SIS is not set
757# CONFIG_PATA_TOSHIBA is not set
721# CONFIG_PATA_VIA is not set 758# CONFIG_PATA_VIA is not set
722# CONFIG_PATA_WINBOND is not set 759# CONFIG_PATA_WINBOND is not set
723# CONFIG_PATA_PLATFORM is not set 760# CONFIG_PATA_PLATFORM is not set
@@ -744,7 +781,7 @@ CONFIG_MD_RAID1=y
744# 781#
745 782
746# 783#
747# See the help texts for more information. 784# The newer stack is recommended.
748# 785#
749# CONFIG_FIREWIRE is not set 786# CONFIG_FIREWIRE is not set
750# CONFIG_IEEE1394 is not set 787# CONFIG_IEEE1394 is not set
@@ -869,8 +906,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
869# CONFIG_BE2NET is not set 906# CONFIG_BE2NET is not set
870# CONFIG_TR is not set 907# CONFIG_TR is not set
871CONFIG_WLAN=y 908CONFIG_WLAN=y
872# CONFIG_WLAN_PRE80211 is not set 909# CONFIG_AIRO is not set
873# CONFIG_WLAN_80211 is not set 910# CONFIG_ATMEL is not set
911# CONFIG_PRISM54 is not set
912# CONFIG_USB_ZD1201 is not set
913# CONFIG_HOSTAP is not set
874 914
875# 915#
876# Enable WiMAX (Networking options) to see the WiMAX drivers 916# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -893,6 +933,7 @@ CONFIG_WLAN=y
893# CONFIG_NETCONSOLE is not set 933# CONFIG_NETCONSOLE is not set
894# CONFIG_NETPOLL is not set 934# CONFIG_NETPOLL is not set
895# CONFIG_NET_POLL_CONTROLLER is not set 935# CONFIG_NET_POLL_CONTROLLER is not set
936# CONFIG_VMXNET3 is not set
896# CONFIG_ISDN is not set 937# CONFIG_ISDN is not set
897# CONFIG_PHONE is not set 938# CONFIG_PHONE is not set
898 939
@@ -902,6 +943,7 @@ CONFIG_WLAN=y
902CONFIG_INPUT=y 943CONFIG_INPUT=y
903# CONFIG_INPUT_FF_MEMLESS is not set 944# CONFIG_INPUT_FF_MEMLESS is not set
904# CONFIG_INPUT_POLLDEV is not set 945# CONFIG_INPUT_POLLDEV is not set
946# CONFIG_INPUT_SPARSEKMAP is not set
905 947
906# 948#
907# Userland interfaces 949# Userland interfaces
@@ -954,6 +996,7 @@ CONFIG_SERIAL_CORE=y
954CONFIG_SERIAL_CORE_CONSOLE=y 996CONFIG_SERIAL_CORE_CONSOLE=y
955# CONFIG_SERIAL_JSM is not set 997# CONFIG_SERIAL_JSM is not set
956# CONFIG_SERIAL_OF_PLATFORM is not set 998# CONFIG_SERIAL_OF_PLATFORM is not set
999# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
957CONFIG_UNIX98_PTYS=y 1000CONFIG_UNIX98_PTYS=y
958# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1001# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
959CONFIG_LEGACY_PTYS=y 1002CONFIG_LEGACY_PTYS=y
@@ -1011,11 +1054,6 @@ CONFIG_I2C_MPC=y
1011# CONFIG_I2C_TINY_USB is not set 1054# CONFIG_I2C_TINY_USB is not set
1012 1055
1013# 1056#
1014# Graphics adapter I2C/DDC channel drivers
1015#
1016# CONFIG_I2C_VOODOO3 is not set
1017
1018#
1019# Other I2C/SMBus bus drivers 1057# Other I2C/SMBus bus drivers
1020# 1058#
1021# CONFIG_I2C_PCA_PLATFORM is not set 1059# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1024,7 +1062,6 @@ CONFIG_I2C_MPC=y
1024# 1062#
1025# Miscellaneous I2C Chip support 1063# Miscellaneous I2C Chip support
1026# 1064#
1027# CONFIG_DS1682 is not set
1028# CONFIG_SENSORS_TSL2550 is not set 1065# CONFIG_SENSORS_TSL2550 is not set
1029# CONFIG_I2C_DEBUG_CORE is not set 1066# CONFIG_I2C_DEBUG_CORE is not set
1030# CONFIG_I2C_DEBUG_ALGO is not set 1067# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1039,6 +1076,8 @@ CONFIG_SPI_MASTER=y
1039# 1076#
1040CONFIG_SPI_BITBANG=y 1077CONFIG_SPI_BITBANG=y
1041# CONFIG_SPI_MPC8xxx is not set 1078# CONFIG_SPI_MPC8xxx is not set
1079# CONFIG_SPI_XILINX is not set
1080# CONFIG_SPI_DESIGNWARE is not set
1042 1081
1043# 1082#
1044# SPI Protocol Masters 1083# SPI Protocol Masters
@@ -1086,6 +1125,7 @@ CONFIG_HWMON=y
1086# CONFIG_SENSORS_IT87 is not set 1125# CONFIG_SENSORS_IT87 is not set
1087# CONFIG_SENSORS_LM63 is not set 1126# CONFIG_SENSORS_LM63 is not set
1088# CONFIG_SENSORS_LM70 is not set 1127# CONFIG_SENSORS_LM70 is not set
1128# CONFIG_SENSORS_LM73 is not set
1089# CONFIG_SENSORS_LM75 is not set 1129# CONFIG_SENSORS_LM75 is not set
1090# CONFIG_SENSORS_LM77 is not set 1130# CONFIG_SENSORS_LM77 is not set
1091# CONFIG_SENSORS_LM78 is not set 1131# CONFIG_SENSORS_LM78 is not set
@@ -1126,6 +1166,7 @@ CONFIG_HWMON=y
1126# CONFIG_SENSORS_W83627HF is not set 1166# CONFIG_SENSORS_W83627HF is not set
1127# CONFIG_SENSORS_W83627EHF is not set 1167# CONFIG_SENSORS_W83627EHF is not set
1128# CONFIG_SENSORS_LIS3_SPI is not set 1168# CONFIG_SENSORS_LIS3_SPI is not set
1169# CONFIG_SENSORS_LIS3_I2C is not set
1129# CONFIG_THERMAL is not set 1170# CONFIG_THERMAL is not set
1130CONFIG_WATCHDOG=y 1171CONFIG_WATCHDOG=y
1131# CONFIG_WATCHDOG_NOWAYOUT is not set 1172# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1163,6 +1204,7 @@ CONFIG_SSB_POSSIBLE=y
1163# CONFIG_TWL4030_CORE is not set 1204# CONFIG_TWL4030_CORE is not set
1164# CONFIG_MFD_TMIO is not set 1205# CONFIG_MFD_TMIO is not set
1165# CONFIG_PMIC_DA903X is not set 1206# CONFIG_PMIC_DA903X is not set
1207# CONFIG_PMIC_ADP5520 is not set
1166# CONFIG_MFD_WM8400 is not set 1208# CONFIG_MFD_WM8400 is not set
1167# CONFIG_MFD_WM831X is not set 1209# CONFIG_MFD_WM831X is not set
1168# CONFIG_MFD_WM8350_I2C is not set 1210# CONFIG_MFD_WM8350_I2C is not set
@@ -1170,6 +1212,8 @@ CONFIG_SSB_POSSIBLE=y
1170# CONFIG_MFD_MC13783 is not set 1212# CONFIG_MFD_MC13783 is not set
1171# CONFIG_AB3100_CORE is not set 1213# CONFIG_AB3100_CORE is not set
1172# CONFIG_EZX_PCAP is not set 1214# CONFIG_EZX_PCAP is not set
1215# CONFIG_MFD_88PM8607 is not set
1216# CONFIG_AB4500_CORE is not set
1173# CONFIG_REGULATOR is not set 1217# CONFIG_REGULATOR is not set
1174# CONFIG_MEDIA_SUPPORT is not set 1218# CONFIG_MEDIA_SUPPORT is not set
1175 1219
@@ -1237,6 +1281,7 @@ CONFIG_USB_MON=y
1237CONFIG_USB_EHCI_HCD=y 1281CONFIG_USB_EHCI_HCD=y
1238CONFIG_USB_EHCI_ROOT_HUB_TT=y 1282CONFIG_USB_EHCI_ROOT_HUB_TT=y
1239# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1283# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1284# CONFIG_XPS_USB_HCD_XILINX is not set
1240CONFIG_USB_EHCI_FSL=y 1285CONFIG_USB_EHCI_FSL=y
1241CONFIG_USB_EHCI_HCD_PPC_OF=y 1286CONFIG_USB_EHCI_HCD_PPC_OF=y
1242# CONFIG_USB_OXU210HP_HCD is not set 1287# CONFIG_USB_OXU210HP_HCD is not set
@@ -1351,15 +1396,17 @@ CONFIG_USB_NET2280=y
1351CONFIG_USB_GADGET_DUALSPEED=y 1396CONFIG_USB_GADGET_DUALSPEED=y
1352# CONFIG_USB_ZERO is not set 1397# CONFIG_USB_ZERO is not set
1353# CONFIG_USB_AUDIO is not set 1398# CONFIG_USB_AUDIO is not set
1354CONFIG_USB_ETH=y 1399CONFIG_USB_ETH=m
1355CONFIG_USB_ETH_RNDIS=y 1400CONFIG_USB_ETH_RNDIS=y
1356# CONFIG_USB_ETH_EEM is not set 1401# CONFIG_USB_ETH_EEM is not set
1357# CONFIG_USB_GADGETFS is not set 1402# CONFIG_USB_GADGETFS is not set
1358# CONFIG_USB_FILE_STORAGE is not set 1403# CONFIG_USB_FILE_STORAGE is not set
1404# CONFIG_USB_MASS_STORAGE is not set
1359# CONFIG_USB_G_SERIAL is not set 1405# CONFIG_USB_G_SERIAL is not set
1360# CONFIG_USB_MIDI_GADGET is not set 1406# CONFIG_USB_MIDI_GADGET is not set
1361# CONFIG_USB_G_PRINTER is not set 1407# CONFIG_USB_G_PRINTER is not set
1362# CONFIG_USB_CDC_COMPOSITE is not set 1408# CONFIG_USB_CDC_COMPOSITE is not set
1409# CONFIG_USB_G_MULTI is not set
1363 1410
1364# 1411#
1365# OTG and related infrastructure 1412# OTG and related infrastructure
@@ -1400,6 +1447,7 @@ CONFIG_RTC_DRV_DS1307=y
1400# CONFIG_RTC_DRV_PCF8563 is not set 1447# CONFIG_RTC_DRV_PCF8563 is not set
1401# CONFIG_RTC_DRV_PCF8583 is not set 1448# CONFIG_RTC_DRV_PCF8583 is not set
1402# CONFIG_RTC_DRV_M41T80 is not set 1449# CONFIG_RTC_DRV_M41T80 is not set
1450# CONFIG_RTC_DRV_BQ32K is not set
1403# CONFIG_RTC_DRV_S35390A is not set 1451# CONFIG_RTC_DRV_S35390A is not set
1404# CONFIG_RTC_DRV_FM3130 is not set 1452# CONFIG_RTC_DRV_FM3130 is not set
1405# CONFIG_RTC_DRV_RX8581 is not set 1453# CONFIG_RTC_DRV_RX8581 is not set
@@ -1429,7 +1477,9 @@ CONFIG_RTC_DRV_DS1307=y
1429# CONFIG_RTC_DRV_M48T86 is not set 1477# CONFIG_RTC_DRV_M48T86 is not set
1430# CONFIG_RTC_DRV_M48T35 is not set 1478# CONFIG_RTC_DRV_M48T35 is not set
1431# CONFIG_RTC_DRV_M48T59 is not set 1479# CONFIG_RTC_DRV_M48T59 is not set
1480# CONFIG_RTC_DRV_MSM6242 is not set
1432# CONFIG_RTC_DRV_BQ4802 is not set 1481# CONFIG_RTC_DRV_BQ4802 is not set
1482# CONFIG_RTC_DRV_RP5C01 is not set
1433# CONFIG_RTC_DRV_V3020 is not set 1483# CONFIG_RTC_DRV_V3020 is not set
1434 1484
1435# 1485#
@@ -1740,7 +1790,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1740# CONFIG_KEYS is not set 1790# CONFIG_KEYS is not set
1741# CONFIG_SECURITY is not set 1791# CONFIG_SECURITY is not set
1742# CONFIG_SECURITYFS is not set 1792# CONFIG_SECURITYFS is not set
1743# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1793# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1794# CONFIG_DEFAULT_SECURITY_SMACK is not set
1795# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1796CONFIG_DEFAULT_SECURITY_DAC=y
1797CONFIG_DEFAULT_SECURITY=""
1744CONFIG_CRYPTO=y 1798CONFIG_CRYPTO=y
1745 1799
1746# 1800#
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index 7def83518a6c..0b4262bd4917 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:24 2009 4# Wed Jan 6 09:24:17 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -260,6 +290,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 290CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
261# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
262# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
293CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +307,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 310# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -444,6 +470,10 @@ CONFIG_BLK_DEV=y
444# CONFIG_BLK_DEV_COW_COMMON is not set 470# CONFIG_BLK_DEV_COW_COMMON is not set
445CONFIG_BLK_DEV_LOOP=y 471CONFIG_BLK_DEV_LOOP=y
446# CONFIG_BLK_DEV_CRYPTOLOOP is not set 472# CONFIG_BLK_DEV_CRYPTOLOOP is not set
473
474#
475# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
476#
447# CONFIG_BLK_DEV_NBD is not set 477# CONFIG_BLK_DEV_NBD is not set
448# CONFIG_BLK_DEV_SX8 is not set 478# CONFIG_BLK_DEV_SX8 is not set
449CONFIG_BLK_DEV_RAM=y 479CONFIG_BLK_DEV_RAM=y
@@ -454,6 +484,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
454# CONFIG_ATA_OVER_ETH is not set 484# CONFIG_ATA_OVER_ETH is not set
455# CONFIG_BLK_DEV_HD is not set 485# CONFIG_BLK_DEV_HD is not set
456CONFIG_MISC_DEVICES=y 486CONFIG_MISC_DEVICES=y
487# CONFIG_AD525X_DPOT is not set
457# CONFIG_PHANTOM is not set 488# CONFIG_PHANTOM is not set
458# CONFIG_SGI_IOC4 is not set 489# CONFIG_SGI_IOC4 is not set
459# CONFIG_TIFM_CORE is not set 490# CONFIG_TIFM_CORE is not set
@@ -461,6 +492,7 @@ CONFIG_MISC_DEVICES=y
461# CONFIG_ENCLOSURE_SERVICES is not set 492# CONFIG_ENCLOSURE_SERVICES is not set
462# CONFIG_HP_ILO is not set 493# CONFIG_HP_ILO is not set
463# CONFIG_ISL29003 is not set 494# CONFIG_ISL29003 is not set
495# CONFIG_DS1682 is not set
464# CONFIG_C2PORT is not set 496# CONFIG_C2PORT is not set
465 497
466# 498#
@@ -513,7 +545,9 @@ CONFIG_SCSI_LOWLEVEL=y
513# CONFIG_SCSI_BNX2_ISCSI is not set 545# CONFIG_SCSI_BNX2_ISCSI is not set
514# CONFIG_BE2ISCSI is not set 546# CONFIG_BE2ISCSI is not set
515# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 547# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
548# CONFIG_SCSI_HPSA is not set
516# CONFIG_SCSI_3W_9XXX is not set 549# CONFIG_SCSI_3W_9XXX is not set
550# CONFIG_SCSI_3W_SAS is not set
517# CONFIG_SCSI_ACARD is not set 551# CONFIG_SCSI_ACARD is not set
518# CONFIG_SCSI_AACRAID is not set 552# CONFIG_SCSI_AACRAID is not set
519# CONFIG_SCSI_AIC7XXX is not set 553# CONFIG_SCSI_AIC7XXX is not set
@@ -551,6 +585,7 @@ CONFIG_SCSI_LOWLEVEL=y
551# CONFIG_SCSI_NSP32 is not set 585# CONFIG_SCSI_NSP32 is not set
552# CONFIG_SCSI_DEBUG is not set 586# CONFIG_SCSI_DEBUG is not set
553# CONFIG_SCSI_PMCRAID is not set 587# CONFIG_SCSI_PMCRAID is not set
588# CONFIG_SCSI_PM8001 is not set
554# CONFIG_SCSI_SRP is not set 589# CONFIG_SCSI_SRP is not set
555# CONFIG_SCSI_BFA_FC is not set 590# CONFIG_SCSI_BFA_FC is not set
556# CONFIG_SCSI_DH is not set 591# CONFIG_SCSI_DH is not set
@@ -568,7 +603,7 @@ CONFIG_SCSI_LOWLEVEL=y
568# 603#
569 604
570# 605#
571# See the help texts for more information. 606# The newer stack is recommended.
572# 607#
573# CONFIG_FIREWIRE is not set 608# CONFIG_FIREWIRE is not set
574# CONFIG_IEEE1394 is not set 609# CONFIG_IEEE1394 is not set
@@ -675,8 +710,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
675# CONFIG_BE2NET is not set 710# CONFIG_BE2NET is not set
676# CONFIG_TR is not set 711# CONFIG_TR is not set
677CONFIG_WLAN=y 712CONFIG_WLAN=y
678# CONFIG_WLAN_PRE80211 is not set 713# CONFIG_AIRO is not set
679# CONFIG_WLAN_80211 is not set 714# CONFIG_ATMEL is not set
715# CONFIG_PRISM54 is not set
716# CONFIG_HOSTAP is not set
680 717
681# 718#
682# Enable WiMAX (Networking options) to see the WiMAX drivers 719# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -690,6 +727,7 @@ CONFIG_WLAN=y
690# CONFIG_NETCONSOLE is not set 727# CONFIG_NETCONSOLE is not set
691# CONFIG_NETPOLL is not set 728# CONFIG_NETPOLL is not set
692# CONFIG_NET_POLL_CONTROLLER is not set 729# CONFIG_NET_POLL_CONTROLLER is not set
730# CONFIG_VMXNET3 is not set
693# CONFIG_ISDN is not set 731# CONFIG_ISDN is not set
694# CONFIG_PHONE is not set 732# CONFIG_PHONE is not set
695 733
@@ -699,6 +737,7 @@ CONFIG_WLAN=y
699CONFIG_INPUT=y 737CONFIG_INPUT=y
700# CONFIG_INPUT_FF_MEMLESS is not set 738# CONFIG_INPUT_FF_MEMLESS is not set
701# CONFIG_INPUT_POLLDEV is not set 739# CONFIG_INPUT_POLLDEV is not set
740# CONFIG_INPUT_SPARSEKMAP is not set
702 741
703# 742#
704# Userland interfaces 743# Userland interfaces
@@ -751,6 +790,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
751# CONFIG_SERIAL_JSM is not set 790# CONFIG_SERIAL_JSM is not set
752# CONFIG_SERIAL_OF_PLATFORM is not set 791# CONFIG_SERIAL_OF_PLATFORM is not set
753# CONFIG_SERIAL_QE is not set 792# CONFIG_SERIAL_QE is not set
793# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
754CONFIG_UNIX98_PTYS=y 794CONFIG_UNIX98_PTYS=y
755# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 795# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
756CONFIG_LEGACY_PTYS=y 796CONFIG_LEGACY_PTYS=y
@@ -807,11 +847,6 @@ CONFIG_I2C_MPC=y
807# CONFIG_I2C_TAOS_EVM is not set 847# CONFIG_I2C_TAOS_EVM is not set
808 848
809# 849#
810# Graphics adapter I2C/DDC channel drivers
811#
812# CONFIG_I2C_VOODOO3 is not set
813
814#
815# Other I2C/SMBus bus drivers 850# Other I2C/SMBus bus drivers
816# 851#
817# CONFIG_I2C_PCA_PLATFORM is not set 852# CONFIG_I2C_PCA_PLATFORM is not set
@@ -820,7 +855,6 @@ CONFIG_I2C_MPC=y
820# 855#
821# Miscellaneous I2C Chip support 856# Miscellaneous I2C Chip support
822# 857#
823# CONFIG_DS1682 is not set
824# CONFIG_SENSORS_TSL2550 is not set 858# CONFIG_SENSORS_TSL2550 is not set
825# CONFIG_I2C_DEBUG_CORE is not set 859# CONFIG_I2C_DEBUG_CORE is not set
826# CONFIG_I2C_DEBUG_ALGO is not set 860# CONFIG_I2C_DEBUG_ALGO is not set
@@ -866,6 +900,7 @@ CONFIG_HWMON=y
866# CONFIG_SENSORS_GL520SM is not set 900# CONFIG_SENSORS_GL520SM is not set
867# CONFIG_SENSORS_IT87 is not set 901# CONFIG_SENSORS_IT87 is not set
868# CONFIG_SENSORS_LM63 is not set 902# CONFIG_SENSORS_LM63 is not set
903# CONFIG_SENSORS_LM73 is not set
869# CONFIG_SENSORS_LM75 is not set 904# CONFIG_SENSORS_LM75 is not set
870# CONFIG_SENSORS_LM77 is not set 905# CONFIG_SENSORS_LM77 is not set
871# CONFIG_SENSORS_LM78 is not set 906# CONFIG_SENSORS_LM78 is not set
@@ -904,6 +939,7 @@ CONFIG_HWMON=y
904# CONFIG_SENSORS_W83L786NG is not set 939# CONFIG_SENSORS_W83L786NG is not set
905# CONFIG_SENSORS_W83627HF is not set 940# CONFIG_SENSORS_W83627HF is not set
906# CONFIG_SENSORS_W83627EHF is not set 941# CONFIG_SENSORS_W83627EHF is not set
942# CONFIG_SENSORS_LIS3_I2C is not set
907# CONFIG_THERMAL is not set 943# CONFIG_THERMAL is not set
908CONFIG_WATCHDOG=y 944CONFIG_WATCHDOG=y
909# CONFIG_WATCHDOG_NOWAYOUT is not set 945# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -936,11 +972,13 @@ CONFIG_SSB_POSSIBLE=y
936# CONFIG_TWL4030_CORE is not set 972# CONFIG_TWL4030_CORE is not set
937# CONFIG_MFD_TMIO is not set 973# CONFIG_MFD_TMIO is not set
938# CONFIG_PMIC_DA903X is not set 974# CONFIG_PMIC_DA903X is not set
975# CONFIG_PMIC_ADP5520 is not set
939# CONFIG_MFD_WM8400 is not set 976# CONFIG_MFD_WM8400 is not set
940# CONFIG_MFD_WM831X is not set 977# CONFIG_MFD_WM831X is not set
941# CONFIG_MFD_WM8350_I2C is not set 978# CONFIG_MFD_WM8350_I2C is not set
942# CONFIG_MFD_PCF50633 is not set 979# CONFIG_MFD_PCF50633 is not set
943# CONFIG_AB3100_CORE is not set 980# CONFIG_AB3100_CORE is not set
981# CONFIG_MFD_88PM8607 is not set
944# CONFIG_REGULATOR is not set 982# CONFIG_REGULATOR is not set
945# CONFIG_MEDIA_SUPPORT is not set 983# CONFIG_MEDIA_SUPPORT is not set
946 984
@@ -1023,6 +1061,7 @@ CONFIG_RTC_DRV_DS1374=y
1023# CONFIG_RTC_DRV_PCF8563 is not set 1061# CONFIG_RTC_DRV_PCF8563 is not set
1024# CONFIG_RTC_DRV_PCF8583 is not set 1062# CONFIG_RTC_DRV_PCF8583 is not set
1025# CONFIG_RTC_DRV_M41T80 is not set 1063# CONFIG_RTC_DRV_M41T80 is not set
1064# CONFIG_RTC_DRV_BQ32K is not set
1026# CONFIG_RTC_DRV_S35390A is not set 1065# CONFIG_RTC_DRV_S35390A is not set
1027# CONFIG_RTC_DRV_FM3130 is not set 1066# CONFIG_RTC_DRV_FM3130 is not set
1028# CONFIG_RTC_DRV_RX8581 is not set 1067# CONFIG_RTC_DRV_RX8581 is not set
@@ -1044,7 +1083,9 @@ CONFIG_RTC_DRV_DS1374=y
1044# CONFIG_RTC_DRV_M48T86 is not set 1083# CONFIG_RTC_DRV_M48T86 is not set
1045# CONFIG_RTC_DRV_M48T35 is not set 1084# CONFIG_RTC_DRV_M48T35 is not set
1046# CONFIG_RTC_DRV_M48T59 is not set 1085# CONFIG_RTC_DRV_M48T59 is not set
1086# CONFIG_RTC_DRV_MSM6242 is not set
1047# CONFIG_RTC_DRV_BQ4802 is not set 1087# CONFIG_RTC_DRV_BQ4802 is not set
1088# CONFIG_RTC_DRV_RP5C01 is not set
1048# CONFIG_RTC_DRV_V3020 is not set 1089# CONFIG_RTC_DRV_V3020 is not set
1049 1090
1050# 1091#
@@ -1220,7 +1261,7 @@ CONFIG_FRAME_WARN=1024
1220# CONFIG_DEBUG_KERNEL is not set 1261# CONFIG_DEBUG_KERNEL is not set
1221# CONFIG_SLUB_DEBUG_ON is not set 1262# CONFIG_SLUB_DEBUG_ON is not set
1222# CONFIG_SLUB_STATS is not set 1263# CONFIG_SLUB_STATS is not set
1223# CONFIG_DEBUG_BUGVERBOSE is not set 1264CONFIG_DEBUG_BUGVERBOSE=y
1224# CONFIG_DEBUG_MEMORY_INIT is not set 1265# CONFIG_DEBUG_MEMORY_INIT is not set
1225# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1266# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1226# CONFIG_LATENCYTOP is not set 1267# CONFIG_LATENCYTOP is not set
@@ -1247,7 +1288,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1247# CONFIG_KEYS is not set 1288# CONFIG_KEYS is not set
1248# CONFIG_SECURITY is not set 1289# CONFIG_SECURITY is not set
1249# CONFIG_SECURITYFS is not set 1290# CONFIG_SECURITYFS is not set
1250# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1291# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1292# CONFIG_DEFAULT_SECURITY_SMACK is not set
1293# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1294CONFIG_DEFAULT_SECURITY_DAC=y
1295CONFIG_DEFAULT_SECURITY=""
1251CONFIG_CRYPTO=y 1296CONFIG_CRYPTO=y
1252 1297
1253# 1298#
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index b398b9b2b635..155af009f7b5 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:24 2009 4# Wed Jan 6 09:24:18 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -260,6 +290,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 290CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
261# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
262# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
293CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +307,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 310# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -445,6 +471,10 @@ CONFIG_BLK_DEV=y
445# CONFIG_BLK_DEV_COW_COMMON is not set 471# CONFIG_BLK_DEV_COW_COMMON is not set
446CONFIG_BLK_DEV_LOOP=y 472CONFIG_BLK_DEV_LOOP=y
447# CONFIG_BLK_DEV_CRYPTOLOOP is not set 473# CONFIG_BLK_DEV_CRYPTOLOOP is not set
474
475#
476# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
477#
448# CONFIG_BLK_DEV_NBD is not set 478# CONFIG_BLK_DEV_NBD is not set
449# CONFIG_BLK_DEV_SX8 is not set 479# CONFIG_BLK_DEV_SX8 is not set
450# CONFIG_BLK_DEV_UB is not set 480# CONFIG_BLK_DEV_UB is not set
@@ -456,6 +486,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
456# CONFIG_ATA_OVER_ETH is not set 486# CONFIG_ATA_OVER_ETH is not set
457# CONFIG_BLK_DEV_HD is not set 487# CONFIG_BLK_DEV_HD is not set
458CONFIG_MISC_DEVICES=y 488CONFIG_MISC_DEVICES=y
489# CONFIG_AD525X_DPOT is not set
459# CONFIG_PHANTOM is not set 490# CONFIG_PHANTOM is not set
460# CONFIG_SGI_IOC4 is not set 491# CONFIG_SGI_IOC4 is not set
461# CONFIG_TIFM_CORE is not set 492# CONFIG_TIFM_CORE is not set
@@ -463,6 +494,8 @@ CONFIG_MISC_DEVICES=y
463# CONFIG_ENCLOSURE_SERVICES is not set 494# CONFIG_ENCLOSURE_SERVICES is not set
464# CONFIG_HP_ILO is not set 495# CONFIG_HP_ILO is not set
465# CONFIG_ISL29003 is not set 496# CONFIG_ISL29003 is not set
497# CONFIG_DS1682 is not set
498# CONFIG_TI_DAC7512 is not set
466# CONFIG_C2PORT is not set 499# CONFIG_C2PORT is not set
467 500
468# 501#
@@ -474,6 +507,7 @@ CONFIG_MISC_DEVICES=y
474# CONFIG_EEPROM_MAX6875 is not set 507# CONFIG_EEPROM_MAX6875 is not set
475# CONFIG_EEPROM_93CX6 is not set 508# CONFIG_EEPROM_93CX6 is not set
476# CONFIG_CB710_CORE is not set 509# CONFIG_CB710_CORE is not set
510# CONFIG_IWMC3200TOP is not set
477CONFIG_HAVE_IDE=y 511CONFIG_HAVE_IDE=y
478# CONFIG_IDE is not set 512# CONFIG_IDE is not set
479 513
@@ -516,7 +550,9 @@ CONFIG_SCSI_LOWLEVEL=y
516# CONFIG_SCSI_BNX2_ISCSI is not set 550# CONFIG_SCSI_BNX2_ISCSI is not set
517# CONFIG_BE2ISCSI is not set 551# CONFIG_BE2ISCSI is not set
518# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 552# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
553# CONFIG_SCSI_HPSA is not set
519# CONFIG_SCSI_3W_9XXX is not set 554# CONFIG_SCSI_3W_9XXX is not set
555# CONFIG_SCSI_3W_SAS is not set
520# CONFIG_SCSI_ACARD is not set 556# CONFIG_SCSI_ACARD is not set
521# CONFIG_SCSI_AACRAID is not set 557# CONFIG_SCSI_AACRAID is not set
522# CONFIG_SCSI_AIC7XXX is not set 558# CONFIG_SCSI_AIC7XXX is not set
@@ -554,6 +590,7 @@ CONFIG_SCSI_LOWLEVEL=y
554# CONFIG_SCSI_NSP32 is not set 590# CONFIG_SCSI_NSP32 is not set
555# CONFIG_SCSI_DEBUG is not set 591# CONFIG_SCSI_DEBUG is not set
556# CONFIG_SCSI_PMCRAID is not set 592# CONFIG_SCSI_PMCRAID is not set
593# CONFIG_SCSI_PM8001 is not set
557# CONFIG_SCSI_SRP is not set 594# CONFIG_SCSI_SRP is not set
558# CONFIG_SCSI_BFA_FC is not set 595# CONFIG_SCSI_BFA_FC is not set
559# CONFIG_SCSI_DH is not set 596# CONFIG_SCSI_DH is not set
@@ -571,7 +608,7 @@ CONFIG_SCSI_LOWLEVEL=y
571# 608#
572 609
573# 610#
574# See the help texts for more information. 611# The newer stack is recommended.
575# 612#
576# CONFIG_FIREWIRE is not set 613# CONFIG_FIREWIRE is not set
577# CONFIG_IEEE1394 is not set 614# CONFIG_IEEE1394 is not set
@@ -680,8 +717,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
680# CONFIG_BE2NET is not set 717# CONFIG_BE2NET is not set
681# CONFIG_TR is not set 718# CONFIG_TR is not set
682CONFIG_WLAN=y 719CONFIG_WLAN=y
683# CONFIG_WLAN_PRE80211 is not set 720# CONFIG_AIRO is not set
684# CONFIG_WLAN_80211 is not set 721# CONFIG_ATMEL is not set
722# CONFIG_PRISM54 is not set
723# CONFIG_USB_ZD1201 is not set
724# CONFIG_HOSTAP is not set
685 725
686# 726#
687# Enable WiMAX (Networking options) to see the WiMAX drivers 727# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -704,6 +744,7 @@ CONFIG_WLAN=y
704# CONFIG_NETCONSOLE is not set 744# CONFIG_NETCONSOLE is not set
705# CONFIG_NETPOLL is not set 745# CONFIG_NETPOLL is not set
706# CONFIG_NET_POLL_CONTROLLER is not set 746# CONFIG_NET_POLL_CONTROLLER is not set
747# CONFIG_VMXNET3 is not set
707# CONFIG_ISDN is not set 748# CONFIG_ISDN is not set
708# CONFIG_PHONE is not set 749# CONFIG_PHONE is not set
709 750
@@ -713,6 +754,7 @@ CONFIG_WLAN=y
713CONFIG_INPUT=y 754CONFIG_INPUT=y
714# CONFIG_INPUT_FF_MEMLESS is not set 755# CONFIG_INPUT_FF_MEMLESS is not set
715# CONFIG_INPUT_POLLDEV is not set 756# CONFIG_INPUT_POLLDEV is not set
757# CONFIG_INPUT_SPARSEKMAP is not set
716 758
717# 759#
718# Userland interfaces 760# Userland interfaces
@@ -766,6 +808,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
766# CONFIG_SERIAL_JSM is not set 808# CONFIG_SERIAL_JSM is not set
767# CONFIG_SERIAL_OF_PLATFORM is not set 809# CONFIG_SERIAL_OF_PLATFORM is not set
768# CONFIG_SERIAL_QE is not set 810# CONFIG_SERIAL_QE is not set
811# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
769CONFIG_UNIX98_PTYS=y 812CONFIG_UNIX98_PTYS=y
770# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 813# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
771CONFIG_LEGACY_PTYS=y 814CONFIG_LEGACY_PTYS=y
@@ -825,11 +868,6 @@ CONFIG_I2C_MPC=y
825# CONFIG_I2C_TINY_USB is not set 868# CONFIG_I2C_TINY_USB is not set
826 869
827# 870#
828# Graphics adapter I2C/DDC channel drivers
829#
830# CONFIG_I2C_VOODOO3 is not set
831
832#
833# Other I2C/SMBus bus drivers 871# Other I2C/SMBus bus drivers
834# 872#
835# CONFIG_I2C_PCA_PLATFORM is not set 873# CONFIG_I2C_PCA_PLATFORM is not set
@@ -838,7 +876,6 @@ CONFIG_I2C_MPC=y
838# 876#
839# Miscellaneous I2C Chip support 877# Miscellaneous I2C Chip support
840# 878#
841# CONFIG_DS1682 is not set
842# CONFIG_SENSORS_TSL2550 is not set 879# CONFIG_SENSORS_TSL2550 is not set
843# CONFIG_I2C_DEBUG_CORE is not set 880# CONFIG_I2C_DEBUG_CORE is not set
844# CONFIG_I2C_DEBUG_ALGO is not set 881# CONFIG_I2C_DEBUG_ALGO is not set
@@ -852,6 +889,8 @@ CONFIG_SPI_MASTER=y
852# 889#
853CONFIG_SPI_BITBANG=y 890CONFIG_SPI_BITBANG=y
854# CONFIG_SPI_MPC8xxx is not set 891# CONFIG_SPI_MPC8xxx is not set
892# CONFIG_SPI_XILINX is not set
893# CONFIG_SPI_DESIGNWARE is not set
855 894
856# 895#
857# SPI Protocol Masters 896# SPI Protocol Masters
@@ -899,6 +938,7 @@ CONFIG_HWMON=y
899# CONFIG_SENSORS_IT87 is not set 938# CONFIG_SENSORS_IT87 is not set
900# CONFIG_SENSORS_LM63 is not set 939# CONFIG_SENSORS_LM63 is not set
901# CONFIG_SENSORS_LM70 is not set 940# CONFIG_SENSORS_LM70 is not set
941# CONFIG_SENSORS_LM73 is not set
902# CONFIG_SENSORS_LM75 is not set 942# CONFIG_SENSORS_LM75 is not set
903# CONFIG_SENSORS_LM77 is not set 943# CONFIG_SENSORS_LM77 is not set
904# CONFIG_SENSORS_LM78 is not set 944# CONFIG_SENSORS_LM78 is not set
@@ -939,6 +979,7 @@ CONFIG_HWMON=y
939# CONFIG_SENSORS_W83627HF is not set 979# CONFIG_SENSORS_W83627HF is not set
940# CONFIG_SENSORS_W83627EHF is not set 980# CONFIG_SENSORS_W83627EHF is not set
941# CONFIG_SENSORS_LIS3_SPI is not set 981# CONFIG_SENSORS_LIS3_SPI is not set
982# CONFIG_SENSORS_LIS3_I2C is not set
942# CONFIG_THERMAL is not set 983# CONFIG_THERMAL is not set
943CONFIG_WATCHDOG=y 984CONFIG_WATCHDOG=y
944# CONFIG_WATCHDOG_NOWAYOUT is not set 985# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -976,6 +1017,7 @@ CONFIG_SSB_POSSIBLE=y
976# CONFIG_TWL4030_CORE is not set 1017# CONFIG_TWL4030_CORE is not set
977# CONFIG_MFD_TMIO is not set 1018# CONFIG_MFD_TMIO is not set
978# CONFIG_PMIC_DA903X is not set 1019# CONFIG_PMIC_DA903X is not set
1020# CONFIG_PMIC_ADP5520 is not set
979# CONFIG_MFD_WM8400 is not set 1021# CONFIG_MFD_WM8400 is not set
980# CONFIG_MFD_WM831X is not set 1022# CONFIG_MFD_WM831X is not set
981# CONFIG_MFD_WM8350_I2C is not set 1023# CONFIG_MFD_WM8350_I2C is not set
@@ -983,6 +1025,8 @@ CONFIG_SSB_POSSIBLE=y
983# CONFIG_MFD_MC13783 is not set 1025# CONFIG_MFD_MC13783 is not set
984# CONFIG_AB3100_CORE is not set 1026# CONFIG_AB3100_CORE is not set
985# CONFIG_EZX_PCAP is not set 1027# CONFIG_EZX_PCAP is not set
1028# CONFIG_MFD_88PM8607 is not set
1029# CONFIG_AB4500_CORE is not set
986# CONFIG_REGULATOR is not set 1030# CONFIG_REGULATOR is not set
987# CONFIG_MEDIA_SUPPORT is not set 1031# CONFIG_MEDIA_SUPPORT is not set
988 1032
@@ -1050,6 +1094,7 @@ CONFIG_USB_MON=y
1050CONFIG_USB_EHCI_HCD=y 1094CONFIG_USB_EHCI_HCD=y
1051# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1095# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1052# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1096# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1097# CONFIG_XPS_USB_HCD_XILINX is not set
1053# CONFIG_USB_EHCI_FSL is not set 1098# CONFIG_USB_EHCI_FSL is not set
1054CONFIG_USB_EHCI_HCD_PPC_OF=y 1099CONFIG_USB_EHCI_HCD_PPC_OF=y
1055# CONFIG_USB_OXU210HP_HCD is not set 1100# CONFIG_USB_OXU210HP_HCD is not set
@@ -1387,7 +1432,7 @@ CONFIG_FRAME_WARN=1024
1387# CONFIG_DEBUG_KERNEL is not set 1432# CONFIG_DEBUG_KERNEL is not set
1388# CONFIG_SLUB_DEBUG_ON is not set 1433# CONFIG_SLUB_DEBUG_ON is not set
1389# CONFIG_SLUB_STATS is not set 1434# CONFIG_SLUB_STATS is not set
1390# CONFIG_DEBUG_BUGVERBOSE is not set 1435CONFIG_DEBUG_BUGVERBOSE=y
1391# CONFIG_DEBUG_MEMORY_INIT is not set 1436# CONFIG_DEBUG_MEMORY_INIT is not set
1392# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1437# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1393# CONFIG_LATENCYTOP is not set 1438# CONFIG_LATENCYTOP is not set
@@ -1414,7 +1459,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1414# CONFIG_KEYS is not set 1459# CONFIG_KEYS is not set
1415# CONFIG_SECURITY is not set 1460# CONFIG_SECURITY is not set
1416# CONFIG_SECURITYFS is not set 1461# CONFIG_SECURITYFS is not set
1417# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1462# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1463# CONFIG_DEFAULT_SECURITY_SMACK is not set
1464# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1465CONFIG_DEFAULT_SECURITY_DAC=y
1466CONFIG_DEFAULT_SECURITY=""
1418CONFIG_CRYPTO=y 1467CONFIG_CRYPTO=y
1419 1468
1420# 1469#
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index f67317e1934c..ff45f4904488 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:25 2009 4# Wed Jan 6 09:24:19 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 432# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -528,6 +554,10 @@ CONFIG_BLK_DEV=y
528# CONFIG_BLK_DEV_COW_COMMON is not set 554# CONFIG_BLK_DEV_COW_COMMON is not set
529CONFIG_BLK_DEV_LOOP=y 555CONFIG_BLK_DEV_LOOP=y
530# CONFIG_BLK_DEV_CRYPTOLOOP is not set 556# CONFIG_BLK_DEV_CRYPTOLOOP is not set
557
558#
559# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
560#
531# CONFIG_BLK_DEV_NBD is not set 561# CONFIG_BLK_DEV_NBD is not set
532# CONFIG_BLK_DEV_SX8 is not set 562# CONFIG_BLK_DEV_SX8 is not set
533# CONFIG_BLK_DEV_UB is not set 563# CONFIG_BLK_DEV_UB is not set
@@ -539,6 +569,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
539# CONFIG_ATA_OVER_ETH is not set 569# CONFIG_ATA_OVER_ETH is not set
540# CONFIG_BLK_DEV_HD is not set 570# CONFIG_BLK_DEV_HD is not set
541CONFIG_MISC_DEVICES=y 571CONFIG_MISC_DEVICES=y
572# CONFIG_AD525X_DPOT is not set
542# CONFIG_PHANTOM is not set 573# CONFIG_PHANTOM is not set
543# CONFIG_SGI_IOC4 is not set 574# CONFIG_SGI_IOC4 is not set
544# CONFIG_TIFM_CORE is not set 575# CONFIG_TIFM_CORE is not set
@@ -546,6 +577,8 @@ CONFIG_MISC_DEVICES=y
546# CONFIG_ENCLOSURE_SERVICES is not set 577# CONFIG_ENCLOSURE_SERVICES is not set
547# CONFIG_HP_ILO is not set 578# CONFIG_HP_ILO is not set
548# CONFIG_ISL29003 is not set 579# CONFIG_ISL29003 is not set
580# CONFIG_DS1682 is not set
581# CONFIG_TI_DAC7512 is not set
549# CONFIG_C2PORT is not set 582# CONFIG_C2PORT is not set
550 583
551# 584#
@@ -647,7 +680,9 @@ CONFIG_SCSI_LOWLEVEL=y
647# CONFIG_SCSI_BNX2_ISCSI is not set 680# CONFIG_SCSI_BNX2_ISCSI is not set
648# CONFIG_BE2ISCSI is not set 681# CONFIG_BE2ISCSI is not set
649# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 682# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
683# CONFIG_SCSI_HPSA is not set
650# CONFIG_SCSI_3W_9XXX is not set 684# CONFIG_SCSI_3W_9XXX is not set
685# CONFIG_SCSI_3W_SAS is not set
651# CONFIG_SCSI_ACARD is not set 686# CONFIG_SCSI_ACARD is not set
652# CONFIG_SCSI_AACRAID is not set 687# CONFIG_SCSI_AACRAID is not set
653# CONFIG_SCSI_AIC7XXX is not set 688# CONFIG_SCSI_AIC7XXX is not set
@@ -686,6 +721,7 @@ CONFIG_SCSI_LOWLEVEL=y
686# CONFIG_SCSI_NSP32 is not set 721# CONFIG_SCSI_NSP32 is not set
687# CONFIG_SCSI_DEBUG is not set 722# CONFIG_SCSI_DEBUG is not set
688# CONFIG_SCSI_PMCRAID is not set 723# CONFIG_SCSI_PMCRAID is not set
724# CONFIG_SCSI_PM8001 is not set
689# CONFIG_SCSI_SRP is not set 725# CONFIG_SCSI_SRP is not set
690# CONFIG_SCSI_BFA_FC is not set 726# CONFIG_SCSI_BFA_FC is not set
691# CONFIG_SCSI_DH is not set 727# CONFIG_SCSI_DH is not set
@@ -741,15 +777,16 @@ CONFIG_SATA_SIL=y
741# CONFIG_PATA_NS87415 is not set 777# CONFIG_PATA_NS87415 is not set
742# CONFIG_PATA_OPTI is not set 778# CONFIG_PATA_OPTI is not set
743# CONFIG_PATA_OPTIDMA is not set 779# CONFIG_PATA_OPTIDMA is not set
780# CONFIG_PATA_PDC2027X is not set
744# CONFIG_PATA_PDC_OLD is not set 781# CONFIG_PATA_PDC_OLD is not set
745# CONFIG_PATA_RADISYS is not set 782# CONFIG_PATA_RADISYS is not set
746# CONFIG_PATA_RDC is not set 783# CONFIG_PATA_RDC is not set
747# CONFIG_PATA_RZ1000 is not set 784# CONFIG_PATA_RZ1000 is not set
748# CONFIG_PATA_SC1200 is not set 785# CONFIG_PATA_SC1200 is not set
749# CONFIG_PATA_SERVERWORKS is not set 786# CONFIG_PATA_SERVERWORKS is not set
750# CONFIG_PATA_PDC2027X is not set
751# CONFIG_PATA_SIL680 is not set 787# CONFIG_PATA_SIL680 is not set
752# CONFIG_PATA_SIS is not set 788# CONFIG_PATA_SIS is not set
789# CONFIG_PATA_TOSHIBA is not set
753# CONFIG_PATA_VIA is not set 790# CONFIG_PATA_VIA is not set
754# CONFIG_PATA_WINBOND is not set 791# CONFIG_PATA_WINBOND is not set
755CONFIG_PATA_PLATFORM=y 792CONFIG_PATA_PLATFORM=y
@@ -777,7 +814,7 @@ CONFIG_MD_RAID1=y
777# 814#
778 815
779# 816#
780# See the help texts for more information. 817# The newer stack is recommended.
781# 818#
782# CONFIG_FIREWIRE is not set 819# CONFIG_FIREWIRE is not set
783# CONFIG_IEEE1394 is not set 820# CONFIG_IEEE1394 is not set
@@ -860,8 +897,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
860# CONFIG_BE2NET is not set 897# CONFIG_BE2NET is not set
861# CONFIG_TR is not set 898# CONFIG_TR is not set
862CONFIG_WLAN=y 899CONFIG_WLAN=y
863# CONFIG_WLAN_PRE80211 is not set 900# CONFIG_AIRO is not set
864# CONFIG_WLAN_80211 is not set 901# CONFIG_ATMEL is not set
902# CONFIG_PRISM54 is not set
903# CONFIG_USB_ZD1201 is not set
904# CONFIG_HOSTAP is not set
865 905
866# 906#
867# Enable WiMAX (Networking options) to see the WiMAX drivers 907# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -884,6 +924,7 @@ CONFIG_WLAN=y
884# CONFIG_NETCONSOLE is not set 924# CONFIG_NETCONSOLE is not set
885# CONFIG_NETPOLL is not set 925# CONFIG_NETPOLL is not set
886# CONFIG_NET_POLL_CONTROLLER is not set 926# CONFIG_NET_POLL_CONTROLLER is not set
927# CONFIG_VMXNET3 is not set
887# CONFIG_ISDN is not set 928# CONFIG_ISDN is not set
888# CONFIG_PHONE is not set 929# CONFIG_PHONE is not set
889 930
@@ -925,6 +966,7 @@ CONFIG_SERIAL_CORE=y
925CONFIG_SERIAL_CORE_CONSOLE=y 966CONFIG_SERIAL_CORE_CONSOLE=y
926# CONFIG_SERIAL_JSM is not set 967# CONFIG_SERIAL_JSM is not set
927# CONFIG_SERIAL_OF_PLATFORM is not set 968# CONFIG_SERIAL_OF_PLATFORM is not set
969# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
928CONFIG_UNIX98_PTYS=y 970CONFIG_UNIX98_PTYS=y
929# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 971# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
930CONFIG_LEGACY_PTYS=y 972CONFIG_LEGACY_PTYS=y
@@ -982,11 +1024,6 @@ CONFIG_I2C_MPC=y
982# CONFIG_I2C_TINY_USB is not set 1024# CONFIG_I2C_TINY_USB is not set
983 1025
984# 1026#
985# Graphics adapter I2C/DDC channel drivers
986#
987# CONFIG_I2C_VOODOO3 is not set
988
989#
990# Other I2C/SMBus bus drivers 1027# Other I2C/SMBus bus drivers
991# 1028#
992# CONFIG_I2C_PCA_PLATFORM is not set 1029# CONFIG_I2C_PCA_PLATFORM is not set
@@ -995,7 +1032,6 @@ CONFIG_I2C_MPC=y
995# 1032#
996# Miscellaneous I2C Chip support 1033# Miscellaneous I2C Chip support
997# 1034#
998# CONFIG_DS1682 is not set
999# CONFIG_SENSORS_TSL2550 is not set 1035# CONFIG_SENSORS_TSL2550 is not set
1000# CONFIG_I2C_DEBUG_CORE is not set 1036# CONFIG_I2C_DEBUG_CORE is not set
1001# CONFIG_I2C_DEBUG_ALGO is not set 1037# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1009,6 +1045,8 @@ CONFIG_SPI_MASTER=y
1009# 1045#
1010CONFIG_SPI_BITBANG=y 1046CONFIG_SPI_BITBANG=y
1011# CONFIG_SPI_MPC8xxx is not set 1047# CONFIG_SPI_MPC8xxx is not set
1048# CONFIG_SPI_XILINX is not set
1049# CONFIG_SPI_DESIGNWARE is not set
1012 1050
1013# 1051#
1014# SPI Protocol Masters 1052# SPI Protocol Masters
@@ -1062,6 +1100,7 @@ CONFIG_SSB_POSSIBLE=y
1062# CONFIG_TWL4030_CORE is not set 1100# CONFIG_TWL4030_CORE is not set
1063# CONFIG_MFD_TMIO is not set 1101# CONFIG_MFD_TMIO is not set
1064# CONFIG_PMIC_DA903X is not set 1102# CONFIG_PMIC_DA903X is not set
1103# CONFIG_PMIC_ADP5520 is not set
1065# CONFIG_MFD_WM8400 is not set 1104# CONFIG_MFD_WM8400 is not set
1066# CONFIG_MFD_WM831X is not set 1105# CONFIG_MFD_WM831X is not set
1067# CONFIG_MFD_WM8350_I2C is not set 1106# CONFIG_MFD_WM8350_I2C is not set
@@ -1069,6 +1108,8 @@ CONFIG_SSB_POSSIBLE=y
1069# CONFIG_MFD_MC13783 is not set 1108# CONFIG_MFD_MC13783 is not set
1070# CONFIG_AB3100_CORE is not set 1109# CONFIG_AB3100_CORE is not set
1071# CONFIG_EZX_PCAP is not set 1110# CONFIG_EZX_PCAP is not set
1111# CONFIG_MFD_88PM8607 is not set
1112# CONFIG_AB4500_CORE is not set
1072# CONFIG_REGULATOR is not set 1113# CONFIG_REGULATOR is not set
1073# CONFIG_MEDIA_SUPPORT is not set 1114# CONFIG_MEDIA_SUPPORT is not set
1074 1115
@@ -1117,6 +1158,7 @@ CONFIG_USB_MON=y
1117CONFIG_USB_EHCI_HCD=y 1158CONFIG_USB_EHCI_HCD=y
1118CONFIG_USB_EHCI_ROOT_HUB_TT=y 1159CONFIG_USB_EHCI_ROOT_HUB_TT=y
1119# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1160# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1161# CONFIG_XPS_USB_HCD_XILINX is not set
1120CONFIG_USB_EHCI_FSL=y 1162CONFIG_USB_EHCI_FSL=y
1121CONFIG_USB_EHCI_HCD_PPC_OF=y 1163CONFIG_USB_EHCI_HCD_PPC_OF=y
1122# CONFIG_USB_OXU210HP_HCD is not set 1164# CONFIG_USB_OXU210HP_HCD is not set
@@ -1235,6 +1277,7 @@ CONFIG_RTC_DRV_DS1307=y
1235# CONFIG_RTC_DRV_PCF8563 is not set 1277# CONFIG_RTC_DRV_PCF8563 is not set
1236# CONFIG_RTC_DRV_PCF8583 is not set 1278# CONFIG_RTC_DRV_PCF8583 is not set
1237# CONFIG_RTC_DRV_M41T80 is not set 1279# CONFIG_RTC_DRV_M41T80 is not set
1280# CONFIG_RTC_DRV_BQ32K is not set
1238# CONFIG_RTC_DRV_S35390A is not set 1281# CONFIG_RTC_DRV_S35390A is not set
1239# CONFIG_RTC_DRV_FM3130 is not set 1282# CONFIG_RTC_DRV_FM3130 is not set
1240# CONFIG_RTC_DRV_RX8581 is not set 1283# CONFIG_RTC_DRV_RX8581 is not set
@@ -1264,7 +1307,9 @@ CONFIG_RTC_DRV_DS1307=y
1264# CONFIG_RTC_DRV_M48T86 is not set 1307# CONFIG_RTC_DRV_M48T86 is not set
1265# CONFIG_RTC_DRV_M48T35 is not set 1308# CONFIG_RTC_DRV_M48T35 is not set
1266# CONFIG_RTC_DRV_M48T59 is not set 1309# CONFIG_RTC_DRV_M48T59 is not set
1310# CONFIG_RTC_DRV_MSM6242 is not set
1267# CONFIG_RTC_DRV_BQ4802 is not set 1311# CONFIG_RTC_DRV_BQ4802 is not set
1312# CONFIG_RTC_DRV_RP5C01 is not set
1268# CONFIG_RTC_DRV_V3020 is not set 1313# CONFIG_RTC_DRV_V3020 is not set
1269 1314
1270# 1315#
@@ -1485,7 +1530,7 @@ CONFIG_FRAME_WARN=1024
1485# CONFIG_DEBUG_KERNEL is not set 1530# CONFIG_DEBUG_KERNEL is not set
1486# CONFIG_SLUB_DEBUG_ON is not set 1531# CONFIG_SLUB_DEBUG_ON is not set
1487# CONFIG_SLUB_STATS is not set 1532# CONFIG_SLUB_STATS is not set
1488# CONFIG_DEBUG_BUGVERBOSE is not set 1533CONFIG_DEBUG_BUGVERBOSE=y
1489# CONFIG_DEBUG_MEMORY_INIT is not set 1534# CONFIG_DEBUG_MEMORY_INIT is not set
1490# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1535# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1491# CONFIG_LATENCYTOP is not set 1536# CONFIG_LATENCYTOP is not set
@@ -1512,7 +1557,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1512# CONFIG_KEYS is not set 1557# CONFIG_KEYS is not set
1513# CONFIG_SECURITY is not set 1558# CONFIG_SECURITY is not set
1514# CONFIG_SECURITYFS is not set 1559# CONFIG_SECURITYFS is not set
1515# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1560# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1561# CONFIG_DEFAULT_SECURITY_SMACK is not set
1562# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1563CONFIG_DEFAULT_SECURITY_DAC=y
1564CONFIG_DEFAULT_SECURITY=""
1516CONFIG_CRYPTO=y 1565CONFIG_CRYPTO=y
1517 1566
1518# 1567#
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index a668110c10f6..28d8ff3e8fca 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:26 2009 4# Wed Jan 6 09:24:20 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 432# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -528,6 +554,10 @@ CONFIG_BLK_DEV=y
528# CONFIG_BLK_DEV_COW_COMMON is not set 554# CONFIG_BLK_DEV_COW_COMMON is not set
529CONFIG_BLK_DEV_LOOP=y 555CONFIG_BLK_DEV_LOOP=y
530# CONFIG_BLK_DEV_CRYPTOLOOP is not set 556# CONFIG_BLK_DEV_CRYPTOLOOP is not set
557
558#
559# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
560#
531# CONFIG_BLK_DEV_NBD is not set 561# CONFIG_BLK_DEV_NBD is not set
532# CONFIG_BLK_DEV_SX8 is not set 562# CONFIG_BLK_DEV_SX8 is not set
533# CONFIG_BLK_DEV_UB is not set 563# CONFIG_BLK_DEV_UB is not set
@@ -539,6 +569,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
539# CONFIG_ATA_OVER_ETH is not set 569# CONFIG_ATA_OVER_ETH is not set
540# CONFIG_BLK_DEV_HD is not set 570# CONFIG_BLK_DEV_HD is not set
541CONFIG_MISC_DEVICES=y 571CONFIG_MISC_DEVICES=y
572# CONFIG_AD525X_DPOT is not set
542# CONFIG_PHANTOM is not set 573# CONFIG_PHANTOM is not set
543# CONFIG_SGI_IOC4 is not set 574# CONFIG_SGI_IOC4 is not set
544# CONFIG_TIFM_CORE is not set 575# CONFIG_TIFM_CORE is not set
@@ -546,6 +577,8 @@ CONFIG_MISC_DEVICES=y
546# CONFIG_ENCLOSURE_SERVICES is not set 577# CONFIG_ENCLOSURE_SERVICES is not set
547# CONFIG_HP_ILO is not set 578# CONFIG_HP_ILO is not set
548# CONFIG_ISL29003 is not set 579# CONFIG_ISL29003 is not set
580# CONFIG_DS1682 is not set
581# CONFIG_TI_DAC7512 is not set
549# CONFIG_C2PORT is not set 582# CONFIG_C2PORT is not set
550 583
551# 584#
@@ -599,7 +632,9 @@ CONFIG_SCSI_LOWLEVEL=y
599# CONFIG_SCSI_BNX2_ISCSI is not set 632# CONFIG_SCSI_BNX2_ISCSI is not set
600# CONFIG_BE2ISCSI is not set 633# CONFIG_BE2ISCSI is not set
601# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 634# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
635# CONFIG_SCSI_HPSA is not set
602# CONFIG_SCSI_3W_9XXX is not set 636# CONFIG_SCSI_3W_9XXX is not set
637# CONFIG_SCSI_3W_SAS is not set
603# CONFIG_SCSI_ACARD is not set 638# CONFIG_SCSI_ACARD is not set
604# CONFIG_SCSI_AACRAID is not set 639# CONFIG_SCSI_AACRAID is not set
605# CONFIG_SCSI_AIC7XXX is not set 640# CONFIG_SCSI_AIC7XXX is not set
@@ -637,6 +672,7 @@ CONFIG_SCSI_LOWLEVEL=y
637# CONFIG_SCSI_NSP32 is not set 672# CONFIG_SCSI_NSP32 is not set
638# CONFIG_SCSI_DEBUG is not set 673# CONFIG_SCSI_DEBUG is not set
639# CONFIG_SCSI_PMCRAID is not set 674# CONFIG_SCSI_PMCRAID is not set
675# CONFIG_SCSI_PM8001 is not set
640# CONFIG_SCSI_SRP is not set 676# CONFIG_SCSI_SRP is not set
641# CONFIG_SCSI_BFA_FC is not set 677# CONFIG_SCSI_BFA_FC is not set
642# CONFIG_SCSI_DH is not set 678# CONFIG_SCSI_DH is not set
@@ -654,7 +690,7 @@ CONFIG_SCSI_LOWLEVEL=y
654# 690#
655 691
656# 692#
657# See the help texts for more information. 693# The newer stack is recommended.
658# 694#
659# CONFIG_FIREWIRE is not set 695# CONFIG_FIREWIRE is not set
660# CONFIG_IEEE1394 is not set 696# CONFIG_IEEE1394 is not set
@@ -737,8 +773,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
737# CONFIG_BE2NET is not set 773# CONFIG_BE2NET is not set
738# CONFIG_TR is not set 774# CONFIG_TR is not set
739CONFIG_WLAN=y 775CONFIG_WLAN=y
740# CONFIG_WLAN_PRE80211 is not set 776# CONFIG_AIRO is not set
741# CONFIG_WLAN_80211 is not set 777# CONFIG_ATMEL is not set
778# CONFIG_PRISM54 is not set
779# CONFIG_USB_ZD1201 is not set
780# CONFIG_HOSTAP is not set
742 781
743# 782#
744# Enable WiMAX (Networking options) to see the WiMAX drivers 783# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -761,6 +800,7 @@ CONFIG_WLAN=y
761# CONFIG_NETCONSOLE is not set 800# CONFIG_NETCONSOLE is not set
762# CONFIG_NETPOLL is not set 801# CONFIG_NETPOLL is not set
763# CONFIG_NET_POLL_CONTROLLER is not set 802# CONFIG_NET_POLL_CONTROLLER is not set
803# CONFIG_VMXNET3 is not set
764# CONFIG_ISDN is not set 804# CONFIG_ISDN is not set
765# CONFIG_PHONE is not set 805# CONFIG_PHONE is not set
766 806
@@ -802,6 +842,7 @@ CONFIG_SERIAL_CORE=y
802CONFIG_SERIAL_CORE_CONSOLE=y 842CONFIG_SERIAL_CORE_CONSOLE=y
803# CONFIG_SERIAL_JSM is not set 843# CONFIG_SERIAL_JSM is not set
804# CONFIG_SERIAL_OF_PLATFORM is not set 844# CONFIG_SERIAL_OF_PLATFORM is not set
845# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
805CONFIG_UNIX98_PTYS=y 846CONFIG_UNIX98_PTYS=y
806# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 847# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
807CONFIG_LEGACY_PTYS=y 848CONFIG_LEGACY_PTYS=y
@@ -859,11 +900,6 @@ CONFIG_I2C_MPC=y
859# CONFIG_I2C_TINY_USB is not set 900# CONFIG_I2C_TINY_USB is not set
860 901
861# 902#
862# Graphics adapter I2C/DDC channel drivers
863#
864# CONFIG_I2C_VOODOO3 is not set
865
866#
867# Other I2C/SMBus bus drivers 903# Other I2C/SMBus bus drivers
868# 904#
869# CONFIG_I2C_PCA_PLATFORM is not set 905# CONFIG_I2C_PCA_PLATFORM is not set
@@ -872,7 +908,6 @@ CONFIG_I2C_MPC=y
872# 908#
873# Miscellaneous I2C Chip support 909# Miscellaneous I2C Chip support
874# 910#
875# CONFIG_DS1682 is not set
876# CONFIG_SENSORS_TSL2550 is not set 911# CONFIG_SENSORS_TSL2550 is not set
877# CONFIG_I2C_DEBUG_CORE is not set 912# CONFIG_I2C_DEBUG_CORE is not set
878# CONFIG_I2C_DEBUG_ALGO is not set 913# CONFIG_I2C_DEBUG_ALGO is not set
@@ -886,6 +921,8 @@ CONFIG_SPI_MASTER=y
886# 921#
887CONFIG_SPI_BITBANG=y 922CONFIG_SPI_BITBANG=y
888# CONFIG_SPI_MPC8xxx is not set 923# CONFIG_SPI_MPC8xxx is not set
924# CONFIG_SPI_XILINX is not set
925# CONFIG_SPI_DESIGNWARE is not set
889 926
890# 927#
891# SPI Protocol Masters 928# SPI Protocol Masters
@@ -939,6 +976,7 @@ CONFIG_SSB_POSSIBLE=y
939# CONFIG_TWL4030_CORE is not set 976# CONFIG_TWL4030_CORE is not set
940# CONFIG_MFD_TMIO is not set 977# CONFIG_MFD_TMIO is not set
941# CONFIG_PMIC_DA903X is not set 978# CONFIG_PMIC_DA903X is not set
979# CONFIG_PMIC_ADP5520 is not set
942# CONFIG_MFD_WM8400 is not set 980# CONFIG_MFD_WM8400 is not set
943# CONFIG_MFD_WM831X is not set 981# CONFIG_MFD_WM831X is not set
944# CONFIG_MFD_WM8350_I2C is not set 982# CONFIG_MFD_WM8350_I2C is not set
@@ -946,6 +984,8 @@ CONFIG_SSB_POSSIBLE=y
946# CONFIG_MFD_MC13783 is not set 984# CONFIG_MFD_MC13783 is not set
947# CONFIG_AB3100_CORE is not set 985# CONFIG_AB3100_CORE is not set
948# CONFIG_EZX_PCAP is not set 986# CONFIG_EZX_PCAP is not set
987# CONFIG_MFD_88PM8607 is not set
988# CONFIG_AB4500_CORE is not set
949# CONFIG_REGULATOR is not set 989# CONFIG_REGULATOR is not set
950# CONFIG_MEDIA_SUPPORT is not set 990# CONFIG_MEDIA_SUPPORT is not set
951 991
@@ -994,6 +1034,7 @@ CONFIG_USB_MON=y
994CONFIG_USB_EHCI_HCD=y 1034CONFIG_USB_EHCI_HCD=y
995CONFIG_USB_EHCI_ROOT_HUB_TT=y 1035CONFIG_USB_EHCI_ROOT_HUB_TT=y
996# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1036# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1037# CONFIG_XPS_USB_HCD_XILINX is not set
997CONFIG_USB_EHCI_FSL=y 1038CONFIG_USB_EHCI_FSL=y
998CONFIG_USB_EHCI_HCD_PPC_OF=y 1039CONFIG_USB_EHCI_HCD_PPC_OF=y
999# CONFIG_USB_OXU210HP_HCD is not set 1040# CONFIG_USB_OXU210HP_HCD is not set
@@ -1112,6 +1153,7 @@ CONFIG_RTC_DRV_DS1307=y
1112# CONFIG_RTC_DRV_PCF8563 is not set 1153# CONFIG_RTC_DRV_PCF8563 is not set
1113# CONFIG_RTC_DRV_PCF8583 is not set 1154# CONFIG_RTC_DRV_PCF8583 is not set
1114# CONFIG_RTC_DRV_M41T80 is not set 1155# CONFIG_RTC_DRV_M41T80 is not set
1156# CONFIG_RTC_DRV_BQ32K is not set
1115# CONFIG_RTC_DRV_S35390A is not set 1157# CONFIG_RTC_DRV_S35390A is not set
1116# CONFIG_RTC_DRV_FM3130 is not set 1158# CONFIG_RTC_DRV_FM3130 is not set
1117# CONFIG_RTC_DRV_RX8581 is not set 1159# CONFIG_RTC_DRV_RX8581 is not set
@@ -1141,7 +1183,9 @@ CONFIG_RTC_DRV_DS1307=y
1141# CONFIG_RTC_DRV_M48T86 is not set 1183# CONFIG_RTC_DRV_M48T86 is not set
1142# CONFIG_RTC_DRV_M48T35 is not set 1184# CONFIG_RTC_DRV_M48T35 is not set
1143# CONFIG_RTC_DRV_M48T59 is not set 1185# CONFIG_RTC_DRV_M48T59 is not set
1186# CONFIG_RTC_DRV_MSM6242 is not set
1144# CONFIG_RTC_DRV_BQ4802 is not set 1187# CONFIG_RTC_DRV_BQ4802 is not set
1188# CONFIG_RTC_DRV_RP5C01 is not set
1145# CONFIG_RTC_DRV_V3020 is not set 1189# CONFIG_RTC_DRV_V3020 is not set
1146 1190
1147# 1191#
@@ -1362,7 +1406,7 @@ CONFIG_FRAME_WARN=1024
1362# CONFIG_DEBUG_KERNEL is not set 1406# CONFIG_DEBUG_KERNEL is not set
1363# CONFIG_SLUB_DEBUG_ON is not set 1407# CONFIG_SLUB_DEBUG_ON is not set
1364# CONFIG_SLUB_STATS is not set 1408# CONFIG_SLUB_STATS is not set
1365# CONFIG_DEBUG_BUGVERBOSE is not set 1409CONFIG_DEBUG_BUGVERBOSE=y
1366# CONFIG_DEBUG_MEMORY_INIT is not set 1410# CONFIG_DEBUG_MEMORY_INIT is not set
1367# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1411# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1368# CONFIG_LATENCYTOP is not set 1412# CONFIG_LATENCYTOP is not set
@@ -1389,7 +1433,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1389# CONFIG_KEYS is not set 1433# CONFIG_KEYS is not set
1390# CONFIG_SECURITY is not set 1434# CONFIG_SECURITY is not set
1391# CONFIG_SECURITYFS is not set 1435# CONFIG_SECURITYFS is not set
1392# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1436# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1437# CONFIG_DEFAULT_SECURITY_SMACK is not set
1438# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1439CONFIG_DEFAULT_SECURITY_DAC=y
1440CONFIG_DEFAULT_SECURITY=""
1393CONFIG_CRYPTO=y 1441CONFIG_CRYPTO=y
1394 1442
1395# 1443#
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index c4e92ba5c38b..6252ab5bf181 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:27 2009 4# Wed Jan 6 09:24:21 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 432# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -443,6 +469,10 @@ CONFIG_BLK_DEV=y
443# CONFIG_BLK_DEV_COW_COMMON is not set 469# CONFIG_BLK_DEV_COW_COMMON is not set
444CONFIG_BLK_DEV_LOOP=y 470CONFIG_BLK_DEV_LOOP=y
445# CONFIG_BLK_DEV_CRYPTOLOOP is not set 471# CONFIG_BLK_DEV_CRYPTOLOOP is not set
472
473#
474# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
475#
446# CONFIG_BLK_DEV_NBD is not set 476# CONFIG_BLK_DEV_NBD is not set
447# CONFIG_BLK_DEV_SX8 is not set 477# CONFIG_BLK_DEV_SX8 is not set
448CONFIG_BLK_DEV_RAM=y 478CONFIG_BLK_DEV_RAM=y
@@ -453,6 +483,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
453# CONFIG_ATA_OVER_ETH is not set 483# CONFIG_ATA_OVER_ETH is not set
454# CONFIG_BLK_DEV_HD is not set 484# CONFIG_BLK_DEV_HD is not set
455CONFIG_MISC_DEVICES=y 485CONFIG_MISC_DEVICES=y
486# CONFIG_AD525X_DPOT is not set
456# CONFIG_PHANTOM is not set 487# CONFIG_PHANTOM is not set
457# CONFIG_SGI_IOC4 is not set 488# CONFIG_SGI_IOC4 is not set
458# CONFIG_TIFM_CORE is not set 489# CONFIG_TIFM_CORE is not set
@@ -460,6 +491,7 @@ CONFIG_MISC_DEVICES=y
460# CONFIG_ENCLOSURE_SERVICES is not set 491# CONFIG_ENCLOSURE_SERVICES is not set
461# CONFIG_HP_ILO is not set 492# CONFIG_HP_ILO is not set
462# CONFIG_ISL29003 is not set 493# CONFIG_ISL29003 is not set
494# CONFIG_DS1682 is not set
463# CONFIG_C2PORT is not set 495# CONFIG_C2PORT is not set
464 496
465# 497#
@@ -493,7 +525,7 @@ CONFIG_HAVE_IDE=y
493# 525#
494 526
495# 527#
496# See the help texts for more information. 528# The newer stack is recommended.
497# 529#
498# CONFIG_FIREWIRE is not set 530# CONFIG_FIREWIRE is not set
499# CONFIG_IEEE1394 is not set 531# CONFIG_IEEE1394 is not set
@@ -616,8 +648,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
616# CONFIG_BE2NET is not set 648# CONFIG_BE2NET is not set
617# CONFIG_TR is not set 649# CONFIG_TR is not set
618CONFIG_WLAN=y 650CONFIG_WLAN=y
619# CONFIG_WLAN_PRE80211 is not set 651# CONFIG_AIRO is not set
620# CONFIG_WLAN_80211 is not set 652# CONFIG_ATMEL is not set
653# CONFIG_PRISM54 is not set
654# CONFIG_HOSTAP is not set
621 655
622# 656#
623# Enable WiMAX (Networking options) to see the WiMAX drivers 657# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -630,6 +664,7 @@ CONFIG_WLAN=y
630# CONFIG_NETCONSOLE is not set 664# CONFIG_NETCONSOLE is not set
631# CONFIG_NETPOLL is not set 665# CONFIG_NETPOLL is not set
632# CONFIG_NET_POLL_CONTROLLER is not set 666# CONFIG_NET_POLL_CONTROLLER is not set
667# CONFIG_VMXNET3 is not set
633# CONFIG_ISDN is not set 668# CONFIG_ISDN is not set
634# CONFIG_PHONE is not set 669# CONFIG_PHONE is not set
635 670
@@ -639,6 +674,7 @@ CONFIG_WLAN=y
639CONFIG_INPUT=y 674CONFIG_INPUT=y
640# CONFIG_INPUT_FF_MEMLESS is not set 675# CONFIG_INPUT_FF_MEMLESS is not set
641# CONFIG_INPUT_POLLDEV is not set 676# CONFIG_INPUT_POLLDEV is not set
677# CONFIG_INPUT_SPARSEKMAP is not set
642 678
643# 679#
644# Userland interfaces 680# Userland interfaces
@@ -690,6 +726,7 @@ CONFIG_SERIAL_CORE=y
690CONFIG_SERIAL_CORE_CONSOLE=y 726CONFIG_SERIAL_CORE_CONSOLE=y
691# CONFIG_SERIAL_JSM is not set 727# CONFIG_SERIAL_JSM is not set
692# CONFIG_SERIAL_OF_PLATFORM is not set 728# CONFIG_SERIAL_OF_PLATFORM is not set
729# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
693CONFIG_UNIX98_PTYS=y 730CONFIG_UNIX98_PTYS=y
694# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 731# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
695CONFIG_LEGACY_PTYS=y 732CONFIG_LEGACY_PTYS=y
@@ -745,11 +782,6 @@ CONFIG_I2C_MPC=y
745# CONFIG_I2C_TAOS_EVM is not set 782# CONFIG_I2C_TAOS_EVM is not set
746 783
747# 784#
748# Graphics adapter I2C/DDC channel drivers
749#
750# CONFIG_I2C_VOODOO3 is not set
751
752#
753# Other I2C/SMBus bus drivers 785# Other I2C/SMBus bus drivers
754# 786#
755# CONFIG_I2C_PCA_PLATFORM is not set 787# CONFIG_I2C_PCA_PLATFORM is not set
@@ -758,7 +790,6 @@ CONFIG_I2C_MPC=y
758# 790#
759# Miscellaneous I2C Chip support 791# Miscellaneous I2C Chip support
760# 792#
761# CONFIG_DS1682 is not set
762# CONFIG_SENSORS_TSL2550 is not set 793# CONFIG_SENSORS_TSL2550 is not set
763# CONFIG_I2C_DEBUG_CORE is not set 794# CONFIG_I2C_DEBUG_CORE is not set
764# CONFIG_I2C_DEBUG_ALGO is not set 795# CONFIG_I2C_DEBUG_ALGO is not set
@@ -804,6 +835,7 @@ CONFIG_HWMON=y
804# CONFIG_SENSORS_GL520SM is not set 835# CONFIG_SENSORS_GL520SM is not set
805# CONFIG_SENSORS_IT87 is not set 836# CONFIG_SENSORS_IT87 is not set
806# CONFIG_SENSORS_LM63 is not set 837# CONFIG_SENSORS_LM63 is not set
838# CONFIG_SENSORS_LM73 is not set
807# CONFIG_SENSORS_LM75 is not set 839# CONFIG_SENSORS_LM75 is not set
808# CONFIG_SENSORS_LM77 is not set 840# CONFIG_SENSORS_LM77 is not set
809# CONFIG_SENSORS_LM78 is not set 841# CONFIG_SENSORS_LM78 is not set
@@ -842,6 +874,7 @@ CONFIG_HWMON=y
842# CONFIG_SENSORS_W83L786NG is not set 874# CONFIG_SENSORS_W83L786NG is not set
843# CONFIG_SENSORS_W83627HF is not set 875# CONFIG_SENSORS_W83627HF is not set
844# CONFIG_SENSORS_W83627EHF is not set 876# CONFIG_SENSORS_W83627EHF is not set
877# CONFIG_SENSORS_LIS3_I2C is not set
845# CONFIG_THERMAL is not set 878# CONFIG_THERMAL is not set
846CONFIG_WATCHDOG=y 879CONFIG_WATCHDOG=y
847# CONFIG_WATCHDOG_NOWAYOUT is not set 880# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -874,11 +907,13 @@ CONFIG_SSB_POSSIBLE=y
874# CONFIG_TWL4030_CORE is not set 907# CONFIG_TWL4030_CORE is not set
875# CONFIG_MFD_TMIO is not set 908# CONFIG_MFD_TMIO is not set
876# CONFIG_PMIC_DA903X is not set 909# CONFIG_PMIC_DA903X is not set
910# CONFIG_PMIC_ADP5520 is not set
877# CONFIG_MFD_WM8400 is not set 911# CONFIG_MFD_WM8400 is not set
878# CONFIG_MFD_WM831X is not set 912# CONFIG_MFD_WM831X is not set
879# CONFIG_MFD_WM8350_I2C is not set 913# CONFIG_MFD_WM8350_I2C is not set
880# CONFIG_MFD_PCF50633 is not set 914# CONFIG_MFD_PCF50633 is not set
881# CONFIG_AB3100_CORE is not set 915# CONFIG_AB3100_CORE is not set
916# CONFIG_MFD_88PM8607 is not set
882# CONFIG_REGULATOR is not set 917# CONFIG_REGULATOR is not set
883# CONFIG_MEDIA_SUPPORT is not set 918# CONFIG_MEDIA_SUPPORT is not set
884 919
@@ -961,6 +996,7 @@ CONFIG_RTC_DRV_DS1374=y
961# CONFIG_RTC_DRV_PCF8563 is not set 996# CONFIG_RTC_DRV_PCF8563 is not set
962# CONFIG_RTC_DRV_PCF8583 is not set 997# CONFIG_RTC_DRV_PCF8583 is not set
963# CONFIG_RTC_DRV_M41T80 is not set 998# CONFIG_RTC_DRV_M41T80 is not set
999# CONFIG_RTC_DRV_BQ32K is not set
964# CONFIG_RTC_DRV_S35390A is not set 1000# CONFIG_RTC_DRV_S35390A is not set
965# CONFIG_RTC_DRV_FM3130 is not set 1001# CONFIG_RTC_DRV_FM3130 is not set
966# CONFIG_RTC_DRV_RX8581 is not set 1002# CONFIG_RTC_DRV_RX8581 is not set
@@ -982,7 +1018,9 @@ CONFIG_RTC_DRV_DS1374=y
982# CONFIG_RTC_DRV_M48T86 is not set 1018# CONFIG_RTC_DRV_M48T86 is not set
983# CONFIG_RTC_DRV_M48T35 is not set 1019# CONFIG_RTC_DRV_M48T35 is not set
984# CONFIG_RTC_DRV_M48T59 is not set 1020# CONFIG_RTC_DRV_M48T59 is not set
1021# CONFIG_RTC_DRV_MSM6242 is not set
985# CONFIG_RTC_DRV_BQ4802 is not set 1022# CONFIG_RTC_DRV_BQ4802 is not set
1023# CONFIG_RTC_DRV_RP5C01 is not set
986# CONFIG_RTC_DRV_V3020 is not set 1024# CONFIG_RTC_DRV_V3020 is not set
987 1025
988# 1026#
@@ -1156,7 +1194,7 @@ CONFIG_FRAME_WARN=1024
1156# CONFIG_DEBUG_KERNEL is not set 1194# CONFIG_DEBUG_KERNEL is not set
1157# CONFIG_SLUB_DEBUG_ON is not set 1195# CONFIG_SLUB_DEBUG_ON is not set
1158# CONFIG_SLUB_STATS is not set 1196# CONFIG_SLUB_STATS is not set
1159# CONFIG_DEBUG_BUGVERBOSE is not set 1197CONFIG_DEBUG_BUGVERBOSE=y
1160# CONFIG_DEBUG_MEMORY_INIT is not set 1198# CONFIG_DEBUG_MEMORY_INIT is not set
1161# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1199# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1162# CONFIG_LATENCYTOP is not set 1200# CONFIG_LATENCYTOP is not set
@@ -1183,7 +1221,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1183# CONFIG_KEYS is not set 1221# CONFIG_KEYS is not set
1184# CONFIG_SECURITY is not set 1222# CONFIG_SECURITY is not set
1185# CONFIG_SECURITYFS is not set 1223# CONFIG_SECURITYFS is not set
1186# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1224# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1225# CONFIG_DEFAULT_SECURITY_SMACK is not set
1226# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1227CONFIG_DEFAULT_SECURITY_DAC=y
1228CONFIG_DEFAULT_SECURITY=""
1187CONFIG_CRYPTO=y 1229CONFIG_CRYPTO=y
1188 1230
1189# 1231#
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 4f434b1492fa..78227378e678 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:28 2009 4# Wed Jan 6 09:24:21 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 176# IO Schedulers
174# 177#
175CONFIG_IOSCHED_NOOP=y 178CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 179CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 180CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 181# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 182CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 183# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 184CONFIG_DEFAULT_IOSCHED="cfq"
185# CONFIG_INLINE_SPIN_TRYLOCK is not set
186# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK is not set
188# CONFIG_INLINE_SPIN_LOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
191CONFIG_INLINE_SPIN_UNLOCK=y
192# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
193CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
194# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
195# CONFIG_INLINE_READ_TRYLOCK is not set
196# CONFIG_INLINE_READ_LOCK is not set
197# CONFIG_INLINE_READ_LOCK_BH is not set
198# CONFIG_INLINE_READ_LOCK_IRQ is not set
199# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
200CONFIG_INLINE_READ_UNLOCK=y
201# CONFIG_INLINE_READ_UNLOCK_BH is not set
202CONFIG_INLINE_READ_UNLOCK_IRQ=y
203# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_WRITE_TRYLOCK is not set
205# CONFIG_INLINE_WRITE_LOCK is not set
206# CONFIG_INLINE_WRITE_LOCK_BH is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
209CONFIG_INLINE_WRITE_UNLOCK=y
210# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
211CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
212# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
213# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 214# CONFIG_FREEZER is not set
185 215
186# 216#
@@ -258,6 +288,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 288CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 289# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 290# CONFIG_CRASH_DUMP is not set
291CONFIG_SPARSE_IRQ=y
261CONFIG_MAX_ACTIVE_REGIONS=32 292CONFIG_MAX_ACTIVE_REGIONS=32
262CONFIG_ARCH_FLATMEM_ENABLE=y 293CONFIG_ARCH_FLATMEM_ENABLE=y
263CONFIG_ARCH_POPULATES_NODE_MAP=y 294CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -274,8 +305,6 @@ CONFIG_MIGRATION=y
274CONFIG_ZONE_DMA_FLAG=1 305CONFIG_ZONE_DMA_FLAG=1
275CONFIG_BOUNCE=y 306CONFIG_BOUNCE=y
276CONFIG_VIRT_TO_BUS=y 307CONFIG_VIRT_TO_BUS=y
277CONFIG_HAVE_MLOCK=y
278CONFIG_HAVE_MLOCKED_PAGE_BIT=y
279# CONFIG_KSM is not set 308# CONFIG_KSM is not set
280CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 309CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
281CONFIG_PPC_4K_PAGES=y 310CONFIG_PPC_4K_PAGES=y
@@ -402,9 +431,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
402# CONFIG_AF_RXRPC is not set 431# CONFIG_AF_RXRPC is not set
403CONFIG_WIRELESS=y 432CONFIG_WIRELESS=y
404# CONFIG_CFG80211 is not set 433# CONFIG_CFG80211 is not set
405CONFIG_CFG80211_DEFAULT_PS_VALUE=0
406CONFIG_WIRELESS_OLD_REGULATORY=y
407# CONFIG_WIRELESS_EXT is not set
408# CONFIG_LIB80211 is not set 434# CONFIG_LIB80211 is not set
409 435
410# 436#
@@ -525,6 +551,10 @@ CONFIG_BLK_DEV=y
525# CONFIG_BLK_DEV_COW_COMMON is not set 551# CONFIG_BLK_DEV_COW_COMMON is not set
526CONFIG_BLK_DEV_LOOP=y 552CONFIG_BLK_DEV_LOOP=y
527# CONFIG_BLK_DEV_CRYPTOLOOP is not set 553# CONFIG_BLK_DEV_CRYPTOLOOP is not set
554
555#
556# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
557#
528# CONFIG_BLK_DEV_NBD is not set 558# CONFIG_BLK_DEV_NBD is not set
529# CONFIG_BLK_DEV_SX8 is not set 559# CONFIG_BLK_DEV_SX8 is not set
530CONFIG_BLK_DEV_RAM=y 560CONFIG_BLK_DEV_RAM=y
@@ -535,6 +565,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
535# CONFIG_ATA_OVER_ETH is not set 565# CONFIG_ATA_OVER_ETH is not set
536# CONFIG_BLK_DEV_HD is not set 566# CONFIG_BLK_DEV_HD is not set
537CONFIG_MISC_DEVICES=y 567CONFIG_MISC_DEVICES=y
568# CONFIG_AD525X_DPOT is not set
538# CONFIG_PHANTOM is not set 569# CONFIG_PHANTOM is not set
539# CONFIG_SGI_IOC4 is not set 570# CONFIG_SGI_IOC4 is not set
540# CONFIG_TIFM_CORE is not set 571# CONFIG_TIFM_CORE is not set
@@ -542,6 +573,7 @@ CONFIG_MISC_DEVICES=y
542# CONFIG_ENCLOSURE_SERVICES is not set 573# CONFIG_ENCLOSURE_SERVICES is not set
543# CONFIG_HP_ILO is not set 574# CONFIG_HP_ILO is not set
544# CONFIG_ISL29003 is not set 575# CONFIG_ISL29003 is not set
576# CONFIG_DS1682 is not set
545# CONFIG_C2PORT is not set 577# CONFIG_C2PORT is not set
546 578
547# 579#
@@ -594,7 +626,9 @@ CONFIG_SCSI_LOWLEVEL=y
594# CONFIG_SCSI_BNX2_ISCSI is not set 626# CONFIG_SCSI_BNX2_ISCSI is not set
595# CONFIG_BE2ISCSI is not set 627# CONFIG_BE2ISCSI is not set
596# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 628# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
629# CONFIG_SCSI_HPSA is not set
597# CONFIG_SCSI_3W_9XXX is not set 630# CONFIG_SCSI_3W_9XXX is not set
631# CONFIG_SCSI_3W_SAS is not set
598# CONFIG_SCSI_ACARD is not set 632# CONFIG_SCSI_ACARD is not set
599# CONFIG_SCSI_AACRAID is not set 633# CONFIG_SCSI_AACRAID is not set
600# CONFIG_SCSI_AIC7XXX is not set 634# CONFIG_SCSI_AIC7XXX is not set
@@ -632,6 +666,7 @@ CONFIG_SCSI_LOWLEVEL=y
632# CONFIG_SCSI_NSP32 is not set 666# CONFIG_SCSI_NSP32 is not set
633# CONFIG_SCSI_DEBUG is not set 667# CONFIG_SCSI_DEBUG is not set
634# CONFIG_SCSI_PMCRAID is not set 668# CONFIG_SCSI_PMCRAID is not set
669# CONFIG_SCSI_PM8001 is not set
635# CONFIG_SCSI_SRP is not set 670# CONFIG_SCSI_SRP is not set
636# CONFIG_SCSI_BFA_FC is not set 671# CONFIG_SCSI_BFA_FC is not set
637# CONFIG_SCSI_DH is not set 672# CONFIG_SCSI_DH is not set
@@ -649,7 +684,7 @@ CONFIG_SCSI_LOWLEVEL=y
649# 684#
650 685
651# 686#
652# See the help texts for more information. 687# The newer stack is recommended.
653# 688#
654# CONFIG_FIREWIRE is not set 689# CONFIG_FIREWIRE is not set
655# CONFIG_IEEE1394 is not set 690# CONFIG_IEEE1394 is not set
@@ -756,8 +791,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
756# CONFIG_BE2NET is not set 791# CONFIG_BE2NET is not set
757# CONFIG_TR is not set 792# CONFIG_TR is not set
758CONFIG_WLAN=y 793CONFIG_WLAN=y
759# CONFIG_WLAN_PRE80211 is not set 794# CONFIG_AIRO is not set
760# CONFIG_WLAN_80211 is not set 795# CONFIG_ATMEL is not set
796# CONFIG_PRISM54 is not set
797# CONFIG_HOSTAP is not set
761 798
762# 799#
763# Enable WiMAX (Networking options) to see the WiMAX drivers 800# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -771,6 +808,7 @@ CONFIG_WLAN=y
771# CONFIG_NETCONSOLE is not set 808# CONFIG_NETCONSOLE is not set
772# CONFIG_NETPOLL is not set 809# CONFIG_NETPOLL is not set
773# CONFIG_NET_POLL_CONTROLLER is not set 810# CONFIG_NET_POLL_CONTROLLER is not set
811# CONFIG_VMXNET3 is not set
774# CONFIG_ISDN is not set 812# CONFIG_ISDN is not set
775# CONFIG_PHONE is not set 813# CONFIG_PHONE is not set
776 814
@@ -780,6 +818,7 @@ CONFIG_WLAN=y
780CONFIG_INPUT=y 818CONFIG_INPUT=y
781# CONFIG_INPUT_FF_MEMLESS is not set 819# CONFIG_INPUT_FF_MEMLESS is not set
782# CONFIG_INPUT_POLLDEV is not set 820# CONFIG_INPUT_POLLDEV is not set
821# CONFIG_INPUT_SPARSEKMAP is not set
783 822
784# 823#
785# Userland interfaces 824# Userland interfaces
@@ -832,6 +871,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
832# CONFIG_SERIAL_JSM is not set 871# CONFIG_SERIAL_JSM is not set
833# CONFIG_SERIAL_OF_PLATFORM is not set 872# CONFIG_SERIAL_OF_PLATFORM is not set
834# CONFIG_SERIAL_QE is not set 873# CONFIG_SERIAL_QE is not set
874# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
835CONFIG_UNIX98_PTYS=y 875CONFIG_UNIX98_PTYS=y
836# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 876# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
837CONFIG_LEGACY_PTYS=y 877CONFIG_LEGACY_PTYS=y
@@ -888,11 +928,6 @@ CONFIG_I2C_MPC=y
888# CONFIG_I2C_TAOS_EVM is not set 928# CONFIG_I2C_TAOS_EVM is not set
889 929
890# 930#
891# Graphics adapter I2C/DDC channel drivers
892#
893# CONFIG_I2C_VOODOO3 is not set
894
895#
896# Other I2C/SMBus bus drivers 931# Other I2C/SMBus bus drivers
897# 932#
898# CONFIG_I2C_PCA_PLATFORM is not set 933# CONFIG_I2C_PCA_PLATFORM is not set
@@ -901,7 +936,6 @@ CONFIG_I2C_MPC=y
901# 936#
902# Miscellaneous I2C Chip support 937# Miscellaneous I2C Chip support
903# 938#
904# CONFIG_DS1682 is not set
905# CONFIG_SENSORS_TSL2550 is not set 939# CONFIG_SENSORS_TSL2550 is not set
906# CONFIG_I2C_DEBUG_CORE is not set 940# CONFIG_I2C_DEBUG_CORE is not set
907# CONFIG_I2C_DEBUG_ALGO is not set 941# CONFIG_I2C_DEBUG_ALGO is not set
@@ -947,6 +981,7 @@ CONFIG_HWMON=y
947# CONFIG_SENSORS_GL520SM is not set 981# CONFIG_SENSORS_GL520SM is not set
948# CONFIG_SENSORS_IT87 is not set 982# CONFIG_SENSORS_IT87 is not set
949# CONFIG_SENSORS_LM63 is not set 983# CONFIG_SENSORS_LM63 is not set
984# CONFIG_SENSORS_LM73 is not set
950# CONFIG_SENSORS_LM75 is not set 985# CONFIG_SENSORS_LM75 is not set
951# CONFIG_SENSORS_LM77 is not set 986# CONFIG_SENSORS_LM77 is not set
952# CONFIG_SENSORS_LM78 is not set 987# CONFIG_SENSORS_LM78 is not set
@@ -985,6 +1020,7 @@ CONFIG_HWMON=y
985# CONFIG_SENSORS_W83L786NG is not set 1020# CONFIG_SENSORS_W83L786NG is not set
986# CONFIG_SENSORS_W83627HF is not set 1021# CONFIG_SENSORS_W83627HF is not set
987# CONFIG_SENSORS_W83627EHF is not set 1022# CONFIG_SENSORS_W83627EHF is not set
1023# CONFIG_SENSORS_LIS3_I2C is not set
988# CONFIG_THERMAL is not set 1024# CONFIG_THERMAL is not set
989CONFIG_WATCHDOG=y 1025CONFIG_WATCHDOG=y
990# CONFIG_WATCHDOG_NOWAYOUT is not set 1026# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1017,11 +1053,13 @@ CONFIG_SSB_POSSIBLE=y
1017# CONFIG_TWL4030_CORE is not set 1053# CONFIG_TWL4030_CORE is not set
1018# CONFIG_MFD_TMIO is not set 1054# CONFIG_MFD_TMIO is not set
1019# CONFIG_PMIC_DA903X is not set 1055# CONFIG_PMIC_DA903X is not set
1056# CONFIG_PMIC_ADP5520 is not set
1020# CONFIG_MFD_WM8400 is not set 1057# CONFIG_MFD_WM8400 is not set
1021# CONFIG_MFD_WM831X is not set 1058# CONFIG_MFD_WM831X is not set
1022# CONFIG_MFD_WM8350_I2C is not set 1059# CONFIG_MFD_WM8350_I2C is not set
1023# CONFIG_MFD_PCF50633 is not set 1060# CONFIG_MFD_PCF50633 is not set
1024# CONFIG_AB3100_CORE is not set 1061# CONFIG_AB3100_CORE is not set
1062# CONFIG_MFD_88PM8607 is not set
1025# CONFIG_REGULATOR is not set 1063# CONFIG_REGULATOR is not set
1026# CONFIG_MEDIA_SUPPORT is not set 1064# CONFIG_MEDIA_SUPPORT is not set
1027 1065
@@ -1104,6 +1142,7 @@ CONFIG_RTC_DRV_DS1374=y
1104# CONFIG_RTC_DRV_PCF8563 is not set 1142# CONFIG_RTC_DRV_PCF8563 is not set
1105# CONFIG_RTC_DRV_PCF8583 is not set 1143# CONFIG_RTC_DRV_PCF8583 is not set
1106# CONFIG_RTC_DRV_M41T80 is not set 1144# CONFIG_RTC_DRV_M41T80 is not set
1145# CONFIG_RTC_DRV_BQ32K is not set
1107# CONFIG_RTC_DRV_S35390A is not set 1146# CONFIG_RTC_DRV_S35390A is not set
1108# CONFIG_RTC_DRV_FM3130 is not set 1147# CONFIG_RTC_DRV_FM3130 is not set
1109# CONFIG_RTC_DRV_RX8581 is not set 1148# CONFIG_RTC_DRV_RX8581 is not set
@@ -1125,7 +1164,9 @@ CONFIG_RTC_DRV_DS1374=y
1125# CONFIG_RTC_DRV_M48T86 is not set 1164# CONFIG_RTC_DRV_M48T86 is not set
1126# CONFIG_RTC_DRV_M48T35 is not set 1165# CONFIG_RTC_DRV_M48T35 is not set
1127# CONFIG_RTC_DRV_M48T59 is not set 1166# CONFIG_RTC_DRV_M48T59 is not set
1167# CONFIG_RTC_DRV_MSM6242 is not set
1128# CONFIG_RTC_DRV_BQ4802 is not set 1168# CONFIG_RTC_DRV_BQ4802 is not set
1169# CONFIG_RTC_DRV_RP5C01 is not set
1129# CONFIG_RTC_DRV_V3020 is not set 1170# CONFIG_RTC_DRV_V3020 is not set
1130 1171
1131# 1172#
@@ -1302,7 +1343,7 @@ CONFIG_FRAME_WARN=1024
1302# CONFIG_DEBUG_KERNEL is not set 1343# CONFIG_DEBUG_KERNEL is not set
1303# CONFIG_SLUB_DEBUG_ON is not set 1344# CONFIG_SLUB_DEBUG_ON is not set
1304# CONFIG_SLUB_STATS is not set 1345# CONFIG_SLUB_STATS is not set
1305# CONFIG_DEBUG_BUGVERBOSE is not set 1346CONFIG_DEBUG_BUGVERBOSE=y
1306# CONFIG_DEBUG_MEMORY_INIT is not set 1347# CONFIG_DEBUG_MEMORY_INIT is not set
1307# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1348# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1308# CONFIG_LATENCYTOP is not set 1349# CONFIG_LATENCYTOP is not set
@@ -1329,7 +1370,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1329# CONFIG_KEYS is not set 1370# CONFIG_KEYS is not set
1330# CONFIG_SECURITY is not set 1371# CONFIG_SECURITY is not set
1331# CONFIG_SECURITYFS is not set 1372# CONFIG_SECURITYFS is not set
1332# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1373# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1374# CONFIG_DEFAULT_SECURITY_SMACK is not set
1375# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1376CONFIG_DEFAULT_SECURITY_DAC=y
1377CONFIG_DEFAULT_SECURITY=""
1333CONFIG_CRYPTO=y 1378CONFIG_CRYPTO=y
1334 1379
1335# 1380#
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index b52ec0861679..9451d6e5c802 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:30 2009 4# Wed Jan 6 09:24:23 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -60,6 +61,7 @@ CONFIG_AUDIT_ARCH=y
60CONFIG_GENERIC_BUG=y 61CONFIG_GENERIC_BUG=y
61CONFIG_DTC=y 62CONFIG_DTC=y
62CONFIG_DEFAULT_UIMAGE=y 63CONFIG_DEFAULT_UIMAGE=y
64CONFIG_ARCH_HIBERNATION_POSSIBLE=y
63CONFIG_ARCH_SUSPEND_POSSIBLE=y 65CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 66# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 67# CONFIG_PPC_DCR_MMIO is not set
@@ -88,6 +90,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 90#
89CONFIG_TREE_RCU=y 91CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 92# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 94# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 95CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 96# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 177# IO Schedulers
175# 178#
176CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
186 216
187# 217#
@@ -258,6 +288,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 288CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 289# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 290# CONFIG_CRASH_DUMP is not set
291CONFIG_SPARSE_IRQ=y
261CONFIG_MAX_ACTIVE_REGIONS=32 292CONFIG_MAX_ACTIVE_REGIONS=32
262CONFIG_ARCH_FLATMEM_ENABLE=y 293CONFIG_ARCH_FLATMEM_ENABLE=y
263CONFIG_ARCH_POPULATES_NODE_MAP=y 294CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -274,8 +305,6 @@ CONFIG_MIGRATION=y
274CONFIG_ZONE_DMA_FLAG=1 305CONFIG_ZONE_DMA_FLAG=1
275CONFIG_BOUNCE=y 306CONFIG_BOUNCE=y
276CONFIG_VIRT_TO_BUS=y 307CONFIG_VIRT_TO_BUS=y
277CONFIG_HAVE_MLOCK=y
278CONFIG_HAVE_MLOCKED_PAGE_BIT=y
279# CONFIG_KSM is not set 308# CONFIG_KSM is not set
280CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 309CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
281CONFIG_PPC_4K_PAGES=y 310CONFIG_PPC_4K_PAGES=y
@@ -404,9 +433,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
404# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408CONFIG_WIRELESS_OLD_REGULATORY=y
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
411 437
412# 438#
@@ -539,6 +565,10 @@ CONFIG_BLK_DEV=y
539# CONFIG_BLK_DEV_COW_COMMON is not set 565# CONFIG_BLK_DEV_COW_COMMON is not set
540CONFIG_BLK_DEV_LOOP=y 566CONFIG_BLK_DEV_LOOP=y
541# CONFIG_BLK_DEV_CRYPTOLOOP is not set 567# CONFIG_BLK_DEV_CRYPTOLOOP is not set
568
569#
570# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
571#
542# CONFIG_BLK_DEV_NBD is not set 572# CONFIG_BLK_DEV_NBD is not set
543# CONFIG_BLK_DEV_SX8 is not set 573# CONFIG_BLK_DEV_SX8 is not set
544CONFIG_BLK_DEV_RAM=y 574CONFIG_BLK_DEV_RAM=y
@@ -549,6 +579,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
549# CONFIG_ATA_OVER_ETH is not set 579# CONFIG_ATA_OVER_ETH is not set
550# CONFIG_BLK_DEV_HD is not set 580# CONFIG_BLK_DEV_HD is not set
551CONFIG_MISC_DEVICES=y 581CONFIG_MISC_DEVICES=y
582# CONFIG_AD525X_DPOT is not set
552# CONFIG_PHANTOM is not set 583# CONFIG_PHANTOM is not set
553# CONFIG_SGI_IOC4 is not set 584# CONFIG_SGI_IOC4 is not set
554# CONFIG_TIFM_CORE is not set 585# CONFIG_TIFM_CORE is not set
@@ -556,6 +587,8 @@ CONFIG_MISC_DEVICES=y
556# CONFIG_ENCLOSURE_SERVICES is not set 587# CONFIG_ENCLOSURE_SERVICES is not set
557# CONFIG_HP_ILO is not set 588# CONFIG_HP_ILO is not set
558# CONFIG_ISL29003 is not set 589# CONFIG_ISL29003 is not set
590# CONFIG_DS1682 is not set
591# CONFIG_TI_DAC7512 is not set
559# CONFIG_C2PORT is not set 592# CONFIG_C2PORT is not set
560 593
561# 594#
@@ -590,7 +623,7 @@ CONFIG_HAVE_IDE=y
590# 623#
591 624
592# 625#
593# See the help texts for more information. 626# The newer stack is recommended.
594# 627#
595# CONFIG_FIREWIRE is not set 628# CONFIG_FIREWIRE is not set
596# CONFIG_IEEE1394 is not set 629# CONFIG_IEEE1394 is not set
@@ -657,8 +690,10 @@ CONFIG_UCC_GETH=y
657# CONFIG_NETDEV_10000 is not set 690# CONFIG_NETDEV_10000 is not set
658# CONFIG_TR is not set 691# CONFIG_TR is not set
659CONFIG_WLAN=y 692CONFIG_WLAN=y
660# CONFIG_WLAN_PRE80211 is not set 693# CONFIG_AIRO is not set
661# CONFIG_WLAN_80211 is not set 694# CONFIG_ATMEL is not set
695# CONFIG_PRISM54 is not set
696# CONFIG_HOSTAP is not set
662 697
663# 698#
664# Enable WiMAX (Networking options) to see the WiMAX drivers 699# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -671,6 +706,7 @@ CONFIG_WLAN=y
671# CONFIG_NETCONSOLE is not set 706# CONFIG_NETCONSOLE is not set
672# CONFIG_NETPOLL is not set 707# CONFIG_NETPOLL is not set
673# CONFIG_NET_POLL_CONTROLLER is not set 708# CONFIG_NET_POLL_CONTROLLER is not set
709# CONFIG_VMXNET3 is not set
674# CONFIG_ISDN is not set 710# CONFIG_ISDN is not set
675# CONFIG_PHONE is not set 711# CONFIG_PHONE is not set
676 712
@@ -680,6 +716,7 @@ CONFIG_WLAN=y
680CONFIG_INPUT=y 716CONFIG_INPUT=y
681# CONFIG_INPUT_FF_MEMLESS is not set 717# CONFIG_INPUT_FF_MEMLESS is not set
682# CONFIG_INPUT_POLLDEV is not set 718# CONFIG_INPUT_POLLDEV is not set
719# CONFIG_INPUT_SPARSEKMAP is not set
683 720
684# 721#
685# Userland interfaces 722# Userland interfaces
@@ -737,6 +774,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
737# CONFIG_SERIAL_JSM is not set 774# CONFIG_SERIAL_JSM is not set
738# CONFIG_SERIAL_OF_PLATFORM is not set 775# CONFIG_SERIAL_OF_PLATFORM is not set
739CONFIG_SERIAL_QE=y 776CONFIG_SERIAL_QE=y
777# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
740CONFIG_UNIX98_PTYS=y 778CONFIG_UNIX98_PTYS=y
741# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 779# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
742CONFIG_LEGACY_PTYS=y 780CONFIG_LEGACY_PTYS=y
@@ -795,11 +833,6 @@ CONFIG_I2C_MPC=y
795# CONFIG_I2C_TAOS_EVM is not set 833# CONFIG_I2C_TAOS_EVM is not set
796 834
797# 835#
798# Graphics adapter I2C/DDC channel drivers
799#
800# CONFIG_I2C_VOODOO3 is not set
801
802#
803# Other I2C/SMBus bus drivers 836# Other I2C/SMBus bus drivers
804# 837#
805# CONFIG_I2C_PCA_PLATFORM is not set 838# CONFIG_I2C_PCA_PLATFORM is not set
@@ -808,7 +841,6 @@ CONFIG_I2C_MPC=y
808# 841#
809# Miscellaneous I2C Chip support 842# Miscellaneous I2C Chip support
810# 843#
811# CONFIG_DS1682 is not set
812# CONFIG_SENSORS_TSL2550 is not set 844# CONFIG_SENSORS_TSL2550 is not set
813# CONFIG_I2C_DEBUG_CORE is not set 845# CONFIG_I2C_DEBUG_CORE is not set
814# CONFIG_I2C_DEBUG_ALGO is not set 846# CONFIG_I2C_DEBUG_ALGO is not set
@@ -823,6 +855,8 @@ CONFIG_SPI_MASTER=y
823CONFIG_SPI_BITBANG=y 855CONFIG_SPI_BITBANG=y
824# CONFIG_SPI_GPIO is not set 856# CONFIG_SPI_GPIO is not set
825# CONFIG_SPI_MPC8xxx is not set 857# CONFIG_SPI_MPC8xxx is not set
858# CONFIG_SPI_XILINX is not set
859# CONFIG_SPI_DESIGNWARE is not set
826 860
827# 861#
828# SPI Protocol Masters 862# SPI Protocol Masters
@@ -854,6 +888,7 @@ CONFIG_GPIOLIB=y
854# 888#
855# PCI GPIO expanders: 889# PCI GPIO expanders:
856# 890#
891# CONFIG_GPIO_CS5535 is not set
857# CONFIG_GPIO_BT8XX is not set 892# CONFIG_GPIO_BT8XX is not set
858# CONFIG_GPIO_LANGWELL is not set 893# CONFIG_GPIO_LANGWELL is not set
859 894
@@ -903,6 +938,7 @@ CONFIG_SSB_POSSIBLE=y
903# CONFIG_TWL4030_CORE is not set 938# CONFIG_TWL4030_CORE is not set
904# CONFIG_MFD_TMIO is not set 939# CONFIG_MFD_TMIO is not set
905# CONFIG_PMIC_DA903X is not set 940# CONFIG_PMIC_DA903X is not set
941# CONFIG_PMIC_ADP5520 is not set
906# CONFIG_MFD_WM8400 is not set 942# CONFIG_MFD_WM8400 is not set
907# CONFIG_MFD_WM831X is not set 943# CONFIG_MFD_WM831X is not set
908# CONFIG_MFD_WM8350_I2C is not set 944# CONFIG_MFD_WM8350_I2C is not set
@@ -910,6 +946,8 @@ CONFIG_SSB_POSSIBLE=y
910# CONFIG_MFD_MC13783 is not set 946# CONFIG_MFD_MC13783 is not set
911# CONFIG_AB3100_CORE is not set 947# CONFIG_AB3100_CORE is not set
912# CONFIG_EZX_PCAP is not set 948# CONFIG_EZX_PCAP is not set
949# CONFIG_MFD_88PM8607 is not set
950# CONFIG_AB4500_CORE is not set
913# CONFIG_REGULATOR is not set 951# CONFIG_REGULATOR is not set
914# CONFIG_MEDIA_SUPPORT is not set 952# CONFIG_MEDIA_SUPPORT is not set
915 953
@@ -1199,7 +1237,7 @@ CONFIG_FRAME_WARN=1024
1199# CONFIG_DEBUG_KERNEL is not set 1237# CONFIG_DEBUG_KERNEL is not set
1200# CONFIG_SLUB_DEBUG_ON is not set 1238# CONFIG_SLUB_DEBUG_ON is not set
1201# CONFIG_SLUB_STATS is not set 1239# CONFIG_SLUB_STATS is not set
1202# CONFIG_DEBUG_BUGVERBOSE is not set 1240CONFIG_DEBUG_BUGVERBOSE=y
1203# CONFIG_DEBUG_MEMORY_INIT is not set 1241# CONFIG_DEBUG_MEMORY_INIT is not set
1204# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1242# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1205# CONFIG_LATENCYTOP is not set 1243# CONFIG_LATENCYTOP is not set
@@ -1230,6 +1268,7 @@ CONFIG_PPC_EARLY_DEBUG=y
1230# CONFIG_PPC_EARLY_DEBUG_44x is not set 1268# CONFIG_PPC_EARLY_DEBUG_44x is not set
1231# CONFIG_PPC_EARLY_DEBUG_40x is not set 1269# CONFIG_PPC_EARLY_DEBUG_40x is not set
1232# CONFIG_PPC_EARLY_DEBUG_CPM is not set 1270# CONFIG_PPC_EARLY_DEBUG_CPM is not set
1271# CONFIG_PPC_EARLY_DEBUG_USBGECKO is not set
1233 1272
1234# 1273#
1235# Security options 1274# Security options
@@ -1237,7 +1276,11 @@ CONFIG_PPC_EARLY_DEBUG=y
1237# CONFIG_KEYS is not set 1276# CONFIG_KEYS is not set
1238# CONFIG_SECURITY is not set 1277# CONFIG_SECURITY is not set
1239# CONFIG_SECURITYFS is not set 1278# CONFIG_SECURITYFS is not set
1240# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1279# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1280# CONFIG_DEFAULT_SECURITY_SMACK is not set
1281# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1282CONFIG_DEFAULT_SECURITY_DAC=y
1283CONFIG_DEFAULT_SECURITY=""
1241CONFIG_CRYPTO=y 1284CONFIG_CRYPTO=y
1242 1285
1243# 1286#
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index 730061574f96..f67b70d0b292 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:29 2009 4# Wed Jan 6 09:24:22 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 177# IO Schedulers
175# 178#
176CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
186 216
187# 217#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 432# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -443,6 +469,10 @@ CONFIG_BLK_DEV=y
443# CONFIG_BLK_DEV_COW_COMMON is not set 469# CONFIG_BLK_DEV_COW_COMMON is not set
444CONFIG_BLK_DEV_LOOP=y 470CONFIG_BLK_DEV_LOOP=y
445# CONFIG_BLK_DEV_CRYPTOLOOP is not set 471# CONFIG_BLK_DEV_CRYPTOLOOP is not set
472
473#
474# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
475#
446# CONFIG_BLK_DEV_NBD is not set 476# CONFIG_BLK_DEV_NBD is not set
447# CONFIG_BLK_DEV_SX8 is not set 477# CONFIG_BLK_DEV_SX8 is not set
448CONFIG_BLK_DEV_RAM=y 478CONFIG_BLK_DEV_RAM=y
@@ -453,6 +483,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
453# CONFIG_ATA_OVER_ETH is not set 483# CONFIG_ATA_OVER_ETH is not set
454# CONFIG_BLK_DEV_HD is not set 484# CONFIG_BLK_DEV_HD is not set
455CONFIG_MISC_DEVICES=y 485CONFIG_MISC_DEVICES=y
486# CONFIG_AD525X_DPOT is not set
456# CONFIG_PHANTOM is not set 487# CONFIG_PHANTOM is not set
457# CONFIG_SGI_IOC4 is not set 488# CONFIG_SGI_IOC4 is not set
458# CONFIG_TIFM_CORE is not set 489# CONFIG_TIFM_CORE is not set
@@ -460,6 +491,7 @@ CONFIG_MISC_DEVICES=y
460# CONFIG_ENCLOSURE_SERVICES is not set 491# CONFIG_ENCLOSURE_SERVICES is not set
461# CONFIG_HP_ILO is not set 492# CONFIG_HP_ILO is not set
462# CONFIG_ISL29003 is not set 493# CONFIG_ISL29003 is not set
494# CONFIG_DS1682 is not set
463# CONFIG_C2PORT is not set 495# CONFIG_C2PORT is not set
464 496
465# 497#
@@ -512,7 +544,9 @@ CONFIG_SCSI_LOWLEVEL=y
512# CONFIG_SCSI_BNX2_ISCSI is not set 544# CONFIG_SCSI_BNX2_ISCSI is not set
513# CONFIG_BE2ISCSI is not set 545# CONFIG_BE2ISCSI is not set
514# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 546# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
547# CONFIG_SCSI_HPSA is not set
515# CONFIG_SCSI_3W_9XXX is not set 548# CONFIG_SCSI_3W_9XXX is not set
549# CONFIG_SCSI_3W_SAS is not set
516# CONFIG_SCSI_ACARD is not set 550# CONFIG_SCSI_ACARD is not set
517# CONFIG_SCSI_AACRAID is not set 551# CONFIG_SCSI_AACRAID is not set
518# CONFIG_SCSI_AIC7XXX is not set 552# CONFIG_SCSI_AIC7XXX is not set
@@ -551,6 +585,7 @@ CONFIG_SCSI_LOWLEVEL=y
551# CONFIG_SCSI_NSP32 is not set 585# CONFIG_SCSI_NSP32 is not set
552# CONFIG_SCSI_DEBUG is not set 586# CONFIG_SCSI_DEBUG is not set
553# CONFIG_SCSI_PMCRAID is not set 587# CONFIG_SCSI_PMCRAID is not set
588# CONFIG_SCSI_PM8001 is not set
554# CONFIG_SCSI_SRP is not set 589# CONFIG_SCSI_SRP is not set
555# CONFIG_SCSI_BFA_FC is not set 590# CONFIG_SCSI_BFA_FC is not set
556# CONFIG_SCSI_DH is not set 591# CONFIG_SCSI_DH is not set
@@ -606,15 +641,16 @@ CONFIG_ATA_SFF=y
606# CONFIG_PATA_NS87415 is not set 641# CONFIG_PATA_NS87415 is not set
607# CONFIG_PATA_OPTI is not set 642# CONFIG_PATA_OPTI is not set
608# CONFIG_PATA_OPTIDMA is not set 643# CONFIG_PATA_OPTIDMA is not set
644# CONFIG_PATA_PDC2027X is not set
609# CONFIG_PATA_PDC_OLD is not set 645# CONFIG_PATA_PDC_OLD is not set
610# CONFIG_PATA_RADISYS is not set 646# CONFIG_PATA_RADISYS is not set
611# CONFIG_PATA_RDC is not set 647# CONFIG_PATA_RDC is not set
612# CONFIG_PATA_RZ1000 is not set 648# CONFIG_PATA_RZ1000 is not set
613# CONFIG_PATA_SC1200 is not set 649# CONFIG_PATA_SC1200 is not set
614# CONFIG_PATA_SERVERWORKS is not set 650# CONFIG_PATA_SERVERWORKS is not set
615# CONFIG_PATA_PDC2027X is not set
616# CONFIG_PATA_SIL680 is not set 651# CONFIG_PATA_SIL680 is not set
617# CONFIG_PATA_SIS is not set 652# CONFIG_PATA_SIS is not set
653# CONFIG_PATA_TOSHIBA is not set
618# CONFIG_PATA_VIA is not set 654# CONFIG_PATA_VIA is not set
619# CONFIG_PATA_WINBOND is not set 655# CONFIG_PATA_WINBOND is not set
620# CONFIG_PATA_PLATFORM is not set 656# CONFIG_PATA_PLATFORM is not set
@@ -631,7 +667,7 @@ CONFIG_ATA_SFF=y
631# 667#
632 668
633# 669#
634# See the help texts for more information. 670# The newer stack is recommended.
635# 671#
636# CONFIG_FIREWIRE is not set 672# CONFIG_FIREWIRE is not set
637# CONFIG_IEEE1394 is not set 673# CONFIG_IEEE1394 is not set
@@ -736,8 +772,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
736# CONFIG_BE2NET is not set 772# CONFIG_BE2NET is not set
737# CONFIG_TR is not set 773# CONFIG_TR is not set
738CONFIG_WLAN=y 774CONFIG_WLAN=y
739# CONFIG_WLAN_PRE80211 is not set 775# CONFIG_AIRO is not set
740# CONFIG_WLAN_80211 is not set 776# CONFIG_ATMEL is not set
777# CONFIG_PRISM54 is not set
778# CONFIG_HOSTAP is not set
741 779
742# 780#
743# Enable WiMAX (Networking options) to see the WiMAX drivers 781# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -751,6 +789,7 @@ CONFIG_WLAN=y
751# CONFIG_NETCONSOLE is not set 789# CONFIG_NETCONSOLE is not set
752# CONFIG_NETPOLL is not set 790# CONFIG_NETPOLL is not set
753# CONFIG_NET_POLL_CONTROLLER is not set 791# CONFIG_NET_POLL_CONTROLLER is not set
792# CONFIG_VMXNET3 is not set
754# CONFIG_ISDN is not set 793# CONFIG_ISDN is not set
755# CONFIG_PHONE is not set 794# CONFIG_PHONE is not set
756 795
@@ -760,6 +799,7 @@ CONFIG_WLAN=y
760CONFIG_INPUT=y 799CONFIG_INPUT=y
761# CONFIG_INPUT_FF_MEMLESS is not set 800# CONFIG_INPUT_FF_MEMLESS is not set
762# CONFIG_INPUT_POLLDEV is not set 801# CONFIG_INPUT_POLLDEV is not set
802# CONFIG_INPUT_SPARSEKMAP is not set
763 803
764# 804#
765# Userland interfaces 805# Userland interfaces
@@ -811,6 +851,7 @@ CONFIG_SERIAL_CORE=y
811CONFIG_SERIAL_CORE_CONSOLE=y 851CONFIG_SERIAL_CORE_CONSOLE=y
812# CONFIG_SERIAL_JSM is not set 852# CONFIG_SERIAL_JSM is not set
813# CONFIG_SERIAL_OF_PLATFORM is not set 853# CONFIG_SERIAL_OF_PLATFORM is not set
854# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
814CONFIG_UNIX98_PTYS=y 855CONFIG_UNIX98_PTYS=y
815# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 856# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
816CONFIG_LEGACY_PTYS=y 857CONFIG_LEGACY_PTYS=y
@@ -868,11 +909,6 @@ CONFIG_I2C_MPC=y
868# CONFIG_I2C_TAOS_EVM is not set 909# CONFIG_I2C_TAOS_EVM is not set
869 910
870# 911#
871# Graphics adapter I2C/DDC channel drivers
872#
873# CONFIG_I2C_VOODOO3 is not set
874
875#
876# Other I2C/SMBus bus drivers 912# Other I2C/SMBus bus drivers
877# 913#
878# CONFIG_I2C_PCA_PLATFORM is not set 914# CONFIG_I2C_PCA_PLATFORM is not set
@@ -881,7 +917,6 @@ CONFIG_I2C_MPC=y
881# 917#
882# Miscellaneous I2C Chip support 918# Miscellaneous I2C Chip support
883# 919#
884# CONFIG_DS1682 is not set
885# CONFIG_SENSORS_TSL2550 is not set 920# CONFIG_SENSORS_TSL2550 is not set
886# CONFIG_I2C_DEBUG_CORE is not set 921# CONFIG_I2C_DEBUG_CORE is not set
887# CONFIG_I2C_DEBUG_ALGO is not set 922# CONFIG_I2C_DEBUG_ALGO is not set
@@ -927,6 +962,7 @@ CONFIG_HWMON=y
927# CONFIG_SENSORS_GL520SM is not set 962# CONFIG_SENSORS_GL520SM is not set
928# CONFIG_SENSORS_IT87 is not set 963# CONFIG_SENSORS_IT87 is not set
929# CONFIG_SENSORS_LM63 is not set 964# CONFIG_SENSORS_LM63 is not set
965# CONFIG_SENSORS_LM73 is not set
930# CONFIG_SENSORS_LM75 is not set 966# CONFIG_SENSORS_LM75 is not set
931# CONFIG_SENSORS_LM77 is not set 967# CONFIG_SENSORS_LM77 is not set
932# CONFIG_SENSORS_LM78 is not set 968# CONFIG_SENSORS_LM78 is not set
@@ -965,6 +1001,7 @@ CONFIG_HWMON=y
965# CONFIG_SENSORS_W83L786NG is not set 1001# CONFIG_SENSORS_W83L786NG is not set
966# CONFIG_SENSORS_W83627HF is not set 1002# CONFIG_SENSORS_W83627HF is not set
967# CONFIG_SENSORS_W83627EHF is not set 1003# CONFIG_SENSORS_W83627EHF is not set
1004# CONFIG_SENSORS_LIS3_I2C is not set
968# CONFIG_THERMAL is not set 1005# CONFIG_THERMAL is not set
969CONFIG_WATCHDOG=y 1006CONFIG_WATCHDOG=y
970# CONFIG_WATCHDOG_NOWAYOUT is not set 1007# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -997,11 +1034,13 @@ CONFIG_SSB_POSSIBLE=y
997# CONFIG_TWL4030_CORE is not set 1034# CONFIG_TWL4030_CORE is not set
998# CONFIG_MFD_TMIO is not set 1035# CONFIG_MFD_TMIO is not set
999# CONFIG_PMIC_DA903X is not set 1036# CONFIG_PMIC_DA903X is not set
1037# CONFIG_PMIC_ADP5520 is not set
1000# CONFIG_MFD_WM8400 is not set 1038# CONFIG_MFD_WM8400 is not set
1001# CONFIG_MFD_WM831X is not set 1039# CONFIG_MFD_WM831X is not set
1002# CONFIG_MFD_WM8350_I2C is not set 1040# CONFIG_MFD_WM8350_I2C is not set
1003# CONFIG_MFD_PCF50633 is not set 1041# CONFIG_MFD_PCF50633 is not set
1004# CONFIG_AB3100_CORE is not set 1042# CONFIG_AB3100_CORE is not set
1043# CONFIG_MFD_88PM8607 is not set
1005# CONFIG_REGULATOR is not set 1044# CONFIG_REGULATOR is not set
1006# CONFIG_MEDIA_SUPPORT is not set 1045# CONFIG_MEDIA_SUPPORT is not set
1007 1046
@@ -1226,7 +1265,7 @@ CONFIG_FRAME_WARN=1024
1226# CONFIG_DEBUG_FS is not set 1265# CONFIG_DEBUG_FS is not set
1227# CONFIG_HEADERS_CHECK is not set 1266# CONFIG_HEADERS_CHECK is not set
1228# CONFIG_DEBUG_KERNEL is not set 1267# CONFIG_DEBUG_KERNEL is not set
1229# CONFIG_DEBUG_BUGVERBOSE is not set 1268CONFIG_DEBUG_BUGVERBOSE=y
1230# CONFIG_DEBUG_MEMORY_INIT is not set 1269# CONFIG_DEBUG_MEMORY_INIT is not set
1231# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1270# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1232# CONFIG_LATENCYTOP is not set 1271# CONFIG_LATENCYTOP is not set
@@ -1253,7 +1292,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1253# CONFIG_KEYS is not set 1292# CONFIG_KEYS is not set
1254# CONFIG_SECURITY is not set 1293# CONFIG_SECURITY is not set
1255# CONFIG_SECURITYFS is not set 1294# CONFIG_SECURITYFS is not set
1256# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1295# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1296# CONFIG_DEFAULT_SECURITY_SMACK is not set
1297# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1298CONFIG_DEFAULT_SECURITY_DAC=y
1299CONFIG_DEFAULT_SECURITY=""
1257CONFIG_CRYPTO=y 1300CONFIG_CRYPTO=y
1258 1301
1259# 1302#
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index 9e9158a5b190..a84fd1194e2b 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:30 2009 4# Wed Jan 6 09:24:24 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +177,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 177# IO Schedulers
175# 178#
176CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
186 216
187# 217#
@@ -259,6 +289,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
292CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +306,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 309# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -398,9 +427,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 427# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 428CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 429# CONFIG_CFG80211 is not set
401CONFIG_CFG80211_DEFAULT_PS_VALUE=0
402CONFIG_WIRELESS_OLD_REGULATORY=y
403# CONFIG_WIRELESS_EXT is not set
404# CONFIG_LIB80211 is not set 430# CONFIG_LIB80211 is not set
405 431
406# 432#
@@ -438,6 +464,10 @@ CONFIG_BLK_DEV=y
438# CONFIG_BLK_DEV_COW_COMMON is not set 464# CONFIG_BLK_DEV_COW_COMMON is not set
439CONFIG_BLK_DEV_LOOP=y 465CONFIG_BLK_DEV_LOOP=y
440# CONFIG_BLK_DEV_CRYPTOLOOP is not set 466# CONFIG_BLK_DEV_CRYPTOLOOP is not set
467
468#
469# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
470#
441# CONFIG_BLK_DEV_NBD is not set 471# CONFIG_BLK_DEV_NBD is not set
442# CONFIG_BLK_DEV_SX8 is not set 472# CONFIG_BLK_DEV_SX8 is not set
443# CONFIG_BLK_DEV_UB is not set 473# CONFIG_BLK_DEV_UB is not set
@@ -449,6 +479,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
449# CONFIG_ATA_OVER_ETH is not set 479# CONFIG_ATA_OVER_ETH is not set
450# CONFIG_BLK_DEV_HD is not set 480# CONFIG_BLK_DEV_HD is not set
451CONFIG_MISC_DEVICES=y 481CONFIG_MISC_DEVICES=y
482# CONFIG_AD525X_DPOT is not set
452# CONFIG_PHANTOM is not set 483# CONFIG_PHANTOM is not set
453# CONFIG_SGI_IOC4 is not set 484# CONFIG_SGI_IOC4 is not set
454# CONFIG_TIFM_CORE is not set 485# CONFIG_TIFM_CORE is not set
@@ -456,6 +487,7 @@ CONFIG_MISC_DEVICES=y
456# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
457# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
458# CONFIG_ISL29003 is not set 489# CONFIG_ISL29003 is not set
490# CONFIG_DS1682 is not set
459# CONFIG_C2PORT is not set 491# CONFIG_C2PORT is not set
460 492
461# 493#
@@ -507,7 +539,9 @@ CONFIG_SCSI_LOWLEVEL=y
507# CONFIG_SCSI_BNX2_ISCSI is not set 539# CONFIG_SCSI_BNX2_ISCSI is not set
508# CONFIG_BE2ISCSI is not set 540# CONFIG_BE2ISCSI is not set
509# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 541# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
542# CONFIG_SCSI_HPSA is not set
510# CONFIG_SCSI_3W_9XXX is not set 543# CONFIG_SCSI_3W_9XXX is not set
544# CONFIG_SCSI_3W_SAS is not set
511# CONFIG_SCSI_ACARD is not set 545# CONFIG_SCSI_ACARD is not set
512# CONFIG_SCSI_AACRAID is not set 546# CONFIG_SCSI_AACRAID is not set
513# CONFIG_SCSI_AIC7XXX is not set 547# CONFIG_SCSI_AIC7XXX is not set
@@ -546,6 +580,7 @@ CONFIG_SCSI_LOWLEVEL=y
546# CONFIG_SCSI_NSP32 is not set 580# CONFIG_SCSI_NSP32 is not set
547# CONFIG_SCSI_DEBUG is not set 581# CONFIG_SCSI_DEBUG is not set
548# CONFIG_SCSI_PMCRAID is not set 582# CONFIG_SCSI_PMCRAID is not set
583# CONFIG_SCSI_PM8001 is not set
549# CONFIG_SCSI_SRP is not set 584# CONFIG_SCSI_SRP is not set
550# CONFIG_SCSI_BFA_FC is not set 585# CONFIG_SCSI_BFA_FC is not set
551# CONFIG_SCSI_DH is not set 586# CONFIG_SCSI_DH is not set
@@ -601,15 +636,16 @@ CONFIG_ATA_SFF=y
601# CONFIG_PATA_NS87415 is not set 636# CONFIG_PATA_NS87415 is not set
602# CONFIG_PATA_OPTI is not set 637# CONFIG_PATA_OPTI is not set
603# CONFIG_PATA_OPTIDMA is not set 638# CONFIG_PATA_OPTIDMA is not set
639# CONFIG_PATA_PDC2027X is not set
604# CONFIG_PATA_PDC_OLD is not set 640# CONFIG_PATA_PDC_OLD is not set
605# CONFIG_PATA_RADISYS is not set 641# CONFIG_PATA_RADISYS is not set
606# CONFIG_PATA_RDC is not set 642# CONFIG_PATA_RDC is not set
607# CONFIG_PATA_RZ1000 is not set 643# CONFIG_PATA_RZ1000 is not set
608# CONFIG_PATA_SC1200 is not set 644# CONFIG_PATA_SC1200 is not set
609# CONFIG_PATA_SERVERWORKS is not set 645# CONFIG_PATA_SERVERWORKS is not set
610# CONFIG_PATA_PDC2027X is not set
611# CONFIG_PATA_SIL680 is not set 646# CONFIG_PATA_SIL680 is not set
612# CONFIG_PATA_SIS is not set 647# CONFIG_PATA_SIS is not set
648# CONFIG_PATA_TOSHIBA is not set
613# CONFIG_PATA_VIA is not set 649# CONFIG_PATA_VIA is not set
614# CONFIG_PATA_WINBOND is not set 650# CONFIG_PATA_WINBOND is not set
615# CONFIG_PATA_PLATFORM is not set 651# CONFIG_PATA_PLATFORM is not set
@@ -638,7 +674,7 @@ CONFIG_MD_RAID6_PQ=y
638# 674#
639 675
640# 676#
641# See the help texts for more information. 677# The newer stack is recommended.
642# 678#
643# CONFIG_FIREWIRE is not set 679# CONFIG_FIREWIRE is not set
644# CONFIG_IEEE1394 is not set 680# CONFIG_IEEE1394 is not set
@@ -725,8 +761,11 @@ CONFIG_GIANFAR=y
725# CONFIG_NETDEV_10000 is not set 761# CONFIG_NETDEV_10000 is not set
726# CONFIG_TR is not set 762# CONFIG_TR is not set
727CONFIG_WLAN=y 763CONFIG_WLAN=y
728# CONFIG_WLAN_PRE80211 is not set 764# CONFIG_AIRO is not set
729# CONFIG_WLAN_80211 is not set 765# CONFIG_ATMEL is not set
766# CONFIG_PRISM54 is not set
767# CONFIG_USB_ZD1201 is not set
768# CONFIG_HOSTAP is not set
730 769
731# 770#
732# Enable WiMAX (Networking options) to see the WiMAX drivers 771# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -749,6 +788,7 @@ CONFIG_WLAN=y
749# CONFIG_NETCONSOLE is not set 788# CONFIG_NETCONSOLE is not set
750# CONFIG_NETPOLL is not set 789# CONFIG_NETPOLL is not set
751# CONFIG_NET_POLL_CONTROLLER is not set 790# CONFIG_NET_POLL_CONTROLLER is not set
791# CONFIG_VMXNET3 is not set
752# CONFIG_ISDN is not set 792# CONFIG_ISDN is not set
753# CONFIG_PHONE is not set 793# CONFIG_PHONE is not set
754 794
@@ -758,6 +798,7 @@ CONFIG_WLAN=y
758CONFIG_INPUT=y 798CONFIG_INPUT=y
759CONFIG_INPUT_FF_MEMLESS=m 799CONFIG_INPUT_FF_MEMLESS=m
760# CONFIG_INPUT_POLLDEV is not set 800# CONFIG_INPUT_POLLDEV is not set
801# CONFIG_INPUT_SPARSEKMAP is not set
761 802
762# 803#
763# Userland interfaces 804# Userland interfaces
@@ -809,6 +850,7 @@ CONFIG_SERIAL_CORE=y
809CONFIG_SERIAL_CORE_CONSOLE=y 850CONFIG_SERIAL_CORE_CONSOLE=y
810# CONFIG_SERIAL_JSM is not set 851# CONFIG_SERIAL_JSM is not set
811# CONFIG_SERIAL_OF_PLATFORM is not set 852# CONFIG_SERIAL_OF_PLATFORM is not set
853# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
812CONFIG_UNIX98_PTYS=y 854CONFIG_UNIX98_PTYS=y
813# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 855# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
814CONFIG_LEGACY_PTYS=y 856CONFIG_LEGACY_PTYS=y
@@ -867,11 +909,6 @@ CONFIG_I2C_MPC=y
867# CONFIG_I2C_TINY_USB is not set 909# CONFIG_I2C_TINY_USB is not set
868 910
869# 911#
870# Graphics adapter I2C/DDC channel drivers
871#
872# CONFIG_I2C_VOODOO3 is not set
873
874#
875# Other I2C/SMBus bus drivers 912# Other I2C/SMBus bus drivers
876# 913#
877# CONFIG_I2C_PCA_PLATFORM is not set 914# CONFIG_I2C_PCA_PLATFORM is not set
@@ -880,7 +917,6 @@ CONFIG_I2C_MPC=y
880# 917#
881# Miscellaneous I2C Chip support 918# Miscellaneous I2C Chip support
882# 919#
883# CONFIG_DS1682 is not set
884# CONFIG_SENSORS_TSL2550 is not set 920# CONFIG_SENSORS_TSL2550 is not set
885# CONFIG_I2C_DEBUG_CORE is not set 921# CONFIG_I2C_DEBUG_CORE is not set
886# CONFIG_I2C_DEBUG_ALGO is not set 922# CONFIG_I2C_DEBUG_ALGO is not set
@@ -926,6 +962,7 @@ CONFIG_HWMON=y
926# CONFIG_SENSORS_GL520SM is not set 962# CONFIG_SENSORS_GL520SM is not set
927# CONFIG_SENSORS_IT87 is not set 963# CONFIG_SENSORS_IT87 is not set
928# CONFIG_SENSORS_LM63 is not set 964# CONFIG_SENSORS_LM63 is not set
965# CONFIG_SENSORS_LM73 is not set
929# CONFIG_SENSORS_LM75 is not set 966# CONFIG_SENSORS_LM75 is not set
930# CONFIG_SENSORS_LM77 is not set 967# CONFIG_SENSORS_LM77 is not set
931# CONFIG_SENSORS_LM78 is not set 968# CONFIG_SENSORS_LM78 is not set
@@ -964,6 +1001,7 @@ CONFIG_HWMON=y
964# CONFIG_SENSORS_W83L786NG is not set 1001# CONFIG_SENSORS_W83L786NG is not set
965# CONFIG_SENSORS_W83627HF is not set 1002# CONFIG_SENSORS_W83627HF is not set
966# CONFIG_SENSORS_W83627EHF is not set 1003# CONFIG_SENSORS_W83627EHF is not set
1004# CONFIG_SENSORS_LIS3_I2C is not set
967# CONFIG_THERMAL is not set 1005# CONFIG_THERMAL is not set
968CONFIG_WATCHDOG=y 1006CONFIG_WATCHDOG=y
969# CONFIG_WATCHDOG_NOWAYOUT is not set 1007# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1001,11 +1039,13 @@ CONFIG_SSB_POSSIBLE=y
1001# CONFIG_TWL4030_CORE is not set 1039# CONFIG_TWL4030_CORE is not set
1002# CONFIG_MFD_TMIO is not set 1040# CONFIG_MFD_TMIO is not set
1003# CONFIG_PMIC_DA903X is not set 1041# CONFIG_PMIC_DA903X is not set
1042# CONFIG_PMIC_ADP5520 is not set
1004# CONFIG_MFD_WM8400 is not set 1043# CONFIG_MFD_WM8400 is not set
1005# CONFIG_MFD_WM831X is not set 1044# CONFIG_MFD_WM831X is not set
1006# CONFIG_MFD_WM8350_I2C is not set 1045# CONFIG_MFD_WM8350_I2C is not set
1007# CONFIG_MFD_PCF50633 is not set 1046# CONFIG_MFD_PCF50633 is not set
1008# CONFIG_AB3100_CORE is not set 1047# CONFIG_AB3100_CORE is not set
1048# CONFIG_MFD_88PM8607 is not set
1009# CONFIG_REGULATOR is not set 1049# CONFIG_REGULATOR is not set
1010# CONFIG_MEDIA_SUPPORT is not set 1050# CONFIG_MEDIA_SUPPORT is not set
1011 1051
@@ -1097,6 +1137,7 @@ CONFIG_USB_MON=y
1097CONFIG_USB_EHCI_HCD=y 1137CONFIG_USB_EHCI_HCD=y
1098CONFIG_USB_EHCI_ROOT_HUB_TT=y 1138CONFIG_USB_EHCI_ROOT_HUB_TT=y
1099# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1139# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1140# CONFIG_XPS_USB_HCD_XILINX is not set
1100CONFIG_USB_EHCI_FSL=y 1141CONFIG_USB_EHCI_FSL=y
1101CONFIG_USB_EHCI_HCD_PPC_OF=y 1142CONFIG_USB_EHCI_HCD_PPC_OF=y
1102# CONFIG_USB_OXU210HP_HCD is not set 1143# CONFIG_USB_OXU210HP_HCD is not set
@@ -1385,7 +1426,7 @@ CONFIG_FRAME_WARN=1024
1385# CONFIG_DEBUG_FS is not set 1426# CONFIG_DEBUG_FS is not set
1386# CONFIG_HEADERS_CHECK is not set 1427# CONFIG_HEADERS_CHECK is not set
1387# CONFIG_DEBUG_KERNEL is not set 1428# CONFIG_DEBUG_KERNEL is not set
1388# CONFIG_DEBUG_BUGVERBOSE is not set 1429CONFIG_DEBUG_BUGVERBOSE=y
1389# CONFIG_DEBUG_MEMORY_INIT is not set 1430# CONFIG_DEBUG_MEMORY_INIT is not set
1390# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1431# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1391# CONFIG_LATENCYTOP is not set 1432# CONFIG_LATENCYTOP is not set
@@ -1412,7 +1453,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1412# CONFIG_KEYS is not set 1453# CONFIG_KEYS is not set
1413# CONFIG_SECURITY is not set 1454# CONFIG_SECURITY is not set
1414# CONFIG_SECURITYFS is not set 1455# CONFIG_SECURITYFS is not set
1415# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1456# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1457# CONFIG_DEFAULT_SECURITY_SMACK is not set
1458# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1459CONFIG_DEFAULT_SECURITY_DAC=y
1460CONFIG_DEFAULT_SECURITY=""
1416CONFIG_XOR_BLOCKS=y 1461CONFIG_XOR_BLOCKS=y
1417CONFIG_ASYNC_CORE=y 1462CONFIG_ASYNC_CORE=y
1418CONFIG_ASYNC_MEMCPY=y 1463CONFIG_ASYNC_MEMCPY=y
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 6b399154970f..72c2067137b9 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:31 2009 4# Wed Jan 6 09:24:25 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -172,14 +175,41 @@ CONFIG_LBDAF=y
172# IO Schedulers 175# IO Schedulers
173# 176#
174CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
175CONFIG_IOSCHED_AS=y
176CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
177CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
178CONFIG_DEFAULT_AS=y
179# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
180# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
181# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
182CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
183# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
184 214
185# 215#
@@ -257,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 287CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258# CONFIG_KEXEC is not set 288# CONFIG_KEXEC is not set
259# CONFIG_CRASH_DUMP is not set 289# CONFIG_CRASH_DUMP is not set
290CONFIG_SPARSE_IRQ=y
260CONFIG_MAX_ACTIVE_REGIONS=32 291CONFIG_MAX_ACTIVE_REGIONS=32
261CONFIG_ARCH_FLATMEM_ENABLE=y 292CONFIG_ARCH_FLATMEM_ENABLE=y
262CONFIG_ARCH_POPULATES_NODE_MAP=y 293CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -273,8 +304,6 @@ CONFIG_MIGRATION=y
273CONFIG_ZONE_DMA_FLAG=1 304CONFIG_ZONE_DMA_FLAG=1
274CONFIG_BOUNCE=y 305CONFIG_BOUNCE=y
275CONFIG_VIRT_TO_BUS=y 306CONFIG_VIRT_TO_BUS=y
276CONFIG_HAVE_MLOCK=y
277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set 307# CONFIG_KSM is not set
279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 308CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
280CONFIG_PPC_4K_PAGES=y 309CONFIG_PPC_4K_PAGES=y
@@ -401,9 +430,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
401# CONFIG_AF_RXRPC is not set 430# CONFIG_AF_RXRPC is not set
402CONFIG_WIRELESS=y 431CONFIG_WIRELESS=y
403# CONFIG_CFG80211 is not set 432# CONFIG_CFG80211 is not set
404CONFIG_CFG80211_DEFAULT_PS_VALUE=0
405CONFIG_WIRELESS_OLD_REGULATORY=y
406# CONFIG_WIRELESS_EXT is not set
407# CONFIG_LIB80211 is not set 433# CONFIG_LIB80211 is not set
408 434
409# 435#
@@ -524,6 +550,10 @@ CONFIG_BLK_DEV=y
524# CONFIG_BLK_DEV_COW_COMMON is not set 550# CONFIG_BLK_DEV_COW_COMMON is not set
525CONFIG_BLK_DEV_LOOP=y 551CONFIG_BLK_DEV_LOOP=y
526# CONFIG_BLK_DEV_CRYPTOLOOP is not set 552# CONFIG_BLK_DEV_CRYPTOLOOP is not set
553
554#
555# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
556#
527# CONFIG_BLK_DEV_NBD is not set 557# CONFIG_BLK_DEV_NBD is not set
528# CONFIG_BLK_DEV_SX8 is not set 558# CONFIG_BLK_DEV_SX8 is not set
529# CONFIG_BLK_DEV_UB is not set 559# CONFIG_BLK_DEV_UB is not set
@@ -535,6 +565,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
535# CONFIG_ATA_OVER_ETH is not set 565# CONFIG_ATA_OVER_ETH is not set
536# CONFIG_BLK_DEV_HD is not set 566# CONFIG_BLK_DEV_HD is not set
537CONFIG_MISC_DEVICES=y 567CONFIG_MISC_DEVICES=y
568# CONFIG_AD525X_DPOT is not set
538# CONFIG_PHANTOM is not set 569# CONFIG_PHANTOM is not set
539# CONFIG_SGI_IOC4 is not set 570# CONFIG_SGI_IOC4 is not set
540# CONFIG_TIFM_CORE is not set 571# CONFIG_TIFM_CORE is not set
@@ -542,6 +573,7 @@ CONFIG_MISC_DEVICES=y
542# CONFIG_ENCLOSURE_SERVICES is not set 573# CONFIG_ENCLOSURE_SERVICES is not set
543# CONFIG_HP_ILO is not set 574# CONFIG_HP_ILO is not set
544# CONFIG_ISL29003 is not set 575# CONFIG_ISL29003 is not set
576# CONFIG_DS1682 is not set
545# CONFIG_C2PORT is not set 577# CONFIG_C2PORT is not set
546 578
547# 579#
@@ -604,7 +636,7 @@ CONFIG_SCSI_WAIT_SCAN=m
604# 636#
605 637
606# 638#
607# See the help texts for more information. 639# The newer stack is recommended.
608# 640#
609# CONFIG_FIREWIRE is not set 641# CONFIG_FIREWIRE is not set
610# CONFIG_IEEE1394 is not set 642# CONFIG_IEEE1394 is not set
@@ -691,8 +723,11 @@ CONFIG_GIANFAR=y
691# CONFIG_NETDEV_10000 is not set 723# CONFIG_NETDEV_10000 is not set
692# CONFIG_TR is not set 724# CONFIG_TR is not set
693CONFIG_WLAN=y 725CONFIG_WLAN=y
694# CONFIG_WLAN_PRE80211 is not set 726# CONFIG_AIRO is not set
695# CONFIG_WLAN_80211 is not set 727# CONFIG_ATMEL is not set
728# CONFIG_PRISM54 is not set
729# CONFIG_USB_ZD1201 is not set
730# CONFIG_HOSTAP is not set
696 731
697# 732#
698# Enable WiMAX (Networking options) to see the WiMAX drivers 733# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -715,6 +750,7 @@ CONFIG_WLAN=y
715# CONFIG_NETCONSOLE is not set 750# CONFIG_NETCONSOLE is not set
716# CONFIG_NETPOLL is not set 751# CONFIG_NETPOLL is not set
717# CONFIG_NET_POLL_CONTROLLER is not set 752# CONFIG_NET_POLL_CONTROLLER is not set
753# CONFIG_VMXNET3 is not set
718# CONFIG_ISDN is not set 754# CONFIG_ISDN is not set
719# CONFIG_PHONE is not set 755# CONFIG_PHONE is not set
720 756
@@ -724,6 +760,7 @@ CONFIG_WLAN=y
724CONFIG_INPUT=y 760CONFIG_INPUT=y
725# CONFIG_INPUT_FF_MEMLESS is not set 761# CONFIG_INPUT_FF_MEMLESS is not set
726# CONFIG_INPUT_POLLDEV is not set 762# CONFIG_INPUT_POLLDEV is not set
763# CONFIG_INPUT_SPARSEKMAP is not set
727 764
728# 765#
729# Userland interfaces 766# Userland interfaces
@@ -775,6 +812,7 @@ CONFIG_SERIAL_CORE=y
775CONFIG_SERIAL_CORE_CONSOLE=y 812CONFIG_SERIAL_CORE_CONSOLE=y
776# CONFIG_SERIAL_JSM is not set 813# CONFIG_SERIAL_JSM is not set
777# CONFIG_SERIAL_OF_PLATFORM is not set 814# CONFIG_SERIAL_OF_PLATFORM is not set
815# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
778CONFIG_UNIX98_PTYS=y 816CONFIG_UNIX98_PTYS=y
779# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 817# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
780CONFIG_LEGACY_PTYS=y 818CONFIG_LEGACY_PTYS=y
@@ -833,11 +871,6 @@ CONFIG_I2C_MPC=y
833# CONFIG_I2C_TINY_USB is not set 871# CONFIG_I2C_TINY_USB is not set
834 872
835# 873#
836# Graphics adapter I2C/DDC channel drivers
837#
838# CONFIG_I2C_VOODOO3 is not set
839
840#
841# Other I2C/SMBus bus drivers 874# Other I2C/SMBus bus drivers
842# 875#
843# CONFIG_I2C_PCA_PLATFORM is not set 876# CONFIG_I2C_PCA_PLATFORM is not set
@@ -846,7 +879,6 @@ CONFIG_I2C_MPC=y
846# 879#
847# Miscellaneous I2C Chip support 880# Miscellaneous I2C Chip support
848# 881#
849# CONFIG_DS1682 is not set
850# CONFIG_SENSORS_TSL2550 is not set 882# CONFIG_SENSORS_TSL2550 is not set
851# CONFIG_I2C_DEBUG_CORE is not set 883# CONFIG_I2C_DEBUG_CORE is not set
852# CONFIG_I2C_DEBUG_ALGO is not set 884# CONFIG_I2C_DEBUG_ALGO is not set
@@ -892,6 +924,7 @@ CONFIG_HWMON=y
892# CONFIG_SENSORS_GL520SM is not set 924# CONFIG_SENSORS_GL520SM is not set
893# CONFIG_SENSORS_IT87 is not set 925# CONFIG_SENSORS_IT87 is not set
894# CONFIG_SENSORS_LM63 is not set 926# CONFIG_SENSORS_LM63 is not set
927# CONFIG_SENSORS_LM73 is not set
895# CONFIG_SENSORS_LM75 is not set 928# CONFIG_SENSORS_LM75 is not set
896# CONFIG_SENSORS_LM77 is not set 929# CONFIG_SENSORS_LM77 is not set
897# CONFIG_SENSORS_LM78 is not set 930# CONFIG_SENSORS_LM78 is not set
@@ -930,6 +963,7 @@ CONFIG_HWMON=y
930# CONFIG_SENSORS_W83L786NG is not set 963# CONFIG_SENSORS_W83L786NG is not set
931# CONFIG_SENSORS_W83627HF is not set 964# CONFIG_SENSORS_W83627HF is not set
932# CONFIG_SENSORS_W83627EHF is not set 965# CONFIG_SENSORS_W83627EHF is not set
966# CONFIG_SENSORS_LIS3_I2C is not set
933# CONFIG_THERMAL is not set 967# CONFIG_THERMAL is not set
934CONFIG_WATCHDOG=y 968CONFIG_WATCHDOG=y
935# CONFIG_WATCHDOG_NOWAYOUT is not set 969# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -967,11 +1001,13 @@ CONFIG_SSB_POSSIBLE=y
967# CONFIG_TWL4030_CORE is not set 1001# CONFIG_TWL4030_CORE is not set
968# CONFIG_MFD_TMIO is not set 1002# CONFIG_MFD_TMIO is not set
969# CONFIG_PMIC_DA903X is not set 1003# CONFIG_PMIC_DA903X is not set
1004# CONFIG_PMIC_ADP5520 is not set
970# CONFIG_MFD_WM8400 is not set 1005# CONFIG_MFD_WM8400 is not set
971# CONFIG_MFD_WM831X is not set 1006# CONFIG_MFD_WM831X is not set
972# CONFIG_MFD_WM8350_I2C is not set 1007# CONFIG_MFD_WM8350_I2C is not set
973# CONFIG_MFD_PCF50633 is not set 1008# CONFIG_MFD_PCF50633 is not set
974# CONFIG_AB3100_CORE is not set 1009# CONFIG_AB3100_CORE is not set
1010# CONFIG_MFD_88PM8607 is not set
975# CONFIG_REGULATOR is not set 1011# CONFIG_REGULATOR is not set
976# CONFIG_MEDIA_SUPPORT is not set 1012# CONFIG_MEDIA_SUPPORT is not set
977 1013
@@ -1039,6 +1075,7 @@ CONFIG_USB_MON=y
1039CONFIG_USB_EHCI_HCD=y 1075CONFIG_USB_EHCI_HCD=y
1040CONFIG_USB_EHCI_ROOT_HUB_TT=y 1076CONFIG_USB_EHCI_ROOT_HUB_TT=y
1041# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1077# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1078# CONFIG_XPS_USB_HCD_XILINX is not set
1042CONFIG_USB_EHCI_FSL=y 1079CONFIG_USB_EHCI_FSL=y
1043CONFIG_USB_EHCI_HCD_PPC_OF=y 1080CONFIG_USB_EHCI_HCD_PPC_OF=y
1044# CONFIG_USB_OXU210HP_HCD is not set 1081# CONFIG_USB_OXU210HP_HCD is not set
@@ -1321,7 +1358,7 @@ CONFIG_FRAME_WARN=1024
1321# CONFIG_DEBUG_FS is not set 1358# CONFIG_DEBUG_FS is not set
1322# CONFIG_HEADERS_CHECK is not set 1359# CONFIG_HEADERS_CHECK is not set
1323# CONFIG_DEBUG_KERNEL is not set 1360# CONFIG_DEBUG_KERNEL is not set
1324# CONFIG_DEBUG_BUGVERBOSE is not set 1361CONFIG_DEBUG_BUGVERBOSE=y
1325# CONFIG_DEBUG_MEMORY_INIT is not set 1362# CONFIG_DEBUG_MEMORY_INIT is not set
1326# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1363# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1327# CONFIG_LATENCYTOP is not set 1364# CONFIG_LATENCYTOP is not set
@@ -1348,7 +1385,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1348# CONFIG_KEYS is not set 1385# CONFIG_KEYS is not set
1349# CONFIG_SECURITY is not set 1386# CONFIG_SECURITY is not set
1350# CONFIG_SECURITYFS is not set 1387# CONFIG_SECURITYFS is not set
1351# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1388# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1389# CONFIG_DEFAULT_SECURITY_SMACK is not set
1390# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1391CONFIG_DEFAULT_SECURITY_DAC=y
1392CONFIG_DEFAULT_SECURITY=""
1352CONFIG_CRYPTO=y 1393CONFIG_CRYPTO=y
1353 1394
1354# 1395#
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig
index a5bde8da462c..21dad38b156f 100644
--- a/arch/powerpc/configs/85xx/ksi8560_defconfig
+++ b/arch/powerpc/configs/85xx/ksi8560_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:32 2009 4# Wed Jan 6 09:24:26 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -169,14 +173,41 @@ CONFIG_LBDAF=y
169# IO Schedulers 173# IO Schedulers
170# 174#
171CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
175CONFIG_DEFAULT_AS=y
176# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
177# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
178# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
179CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
180# CONFIG_FREEZER is not set 211# CONFIG_FREEZER is not set
181 212
182# 213#
@@ -185,7 +216,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
185# CONFIG_PPC_CELL is not set 216# CONFIG_PPC_CELL is not set
186# CONFIG_PPC_CELL_NATIVE is not set 217# CONFIG_PPC_CELL_NATIVE is not set
187# CONFIG_PQ2ADS is not set 218# CONFIG_PQ2ADS is not set
188CONFIG_MPC85xx=y 219CONFIG_FSL_SOC_BOOKE=y
189# CONFIG_MPC8540_ADS is not set 220# CONFIG_MPC8540_ADS is not set
190# CONFIG_MPC8560_ADS is not set 221# CONFIG_MPC8560_ADS is not set
191# CONFIG_MPC85xx_CDS is not set 222# CONFIG_MPC85xx_CDS is not set
@@ -204,6 +235,7 @@ CONFIG_KSI8560=y
204# CONFIG_TQM8560 is not set 235# CONFIG_TQM8560 is not set
205# CONFIG_SBC8548 is not set 236# CONFIG_SBC8548 is not set
206# CONFIG_SBC8560 is not set 237# CONFIG_SBC8560 is not set
238# CONFIG_P4080_DS is not set
207# CONFIG_IPIC is not set 239# CONFIG_IPIC is not set
208CONFIG_MPIC=y 240CONFIG_MPIC=y
209# CONFIG_MPIC_WEIRD is not set 241# CONFIG_MPIC_WEIRD is not set
@@ -248,6 +280,7 @@ CONFIG_MATH_EMULATION=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
249CONFIG_ARCH_HAS_WALK_MEMORY=y 281CONFIG_ARCH_HAS_WALK_MEMORY=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 282CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
283CONFIG_SPARSE_IRQ=y
251CONFIG_MAX_ACTIVE_REGIONS=32 284CONFIG_MAX_ACTIVE_REGIONS=32
252CONFIG_ARCH_FLATMEM_ENABLE=y 285CONFIG_ARCH_FLATMEM_ENABLE=y
253CONFIG_ARCH_POPULATES_NODE_MAP=y 286CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -264,8 +297,6 @@ CONFIG_MIGRATION=y
264CONFIG_ZONE_DMA_FLAG=1 297CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 298CONFIG_BOUNCE=y
266CONFIG_VIRT_TO_BUS=y 299CONFIG_VIRT_TO_BUS=y
267CONFIG_HAVE_MLOCK=y
268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set 300# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 301CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271CONFIG_PPC_4K_PAGES=y 302CONFIG_PPC_4K_PAGES=y
@@ -385,9 +416,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_AF_RXRPC is not set 416# CONFIG_AF_RXRPC is not set
386CONFIG_WIRELESS=y 417CONFIG_WIRELESS=y
387# CONFIG_CFG80211 is not set 418# CONFIG_CFG80211 is not set
388CONFIG_CFG80211_DEFAULT_PS_VALUE=0
389CONFIG_WIRELESS_OLD_REGULATORY=y
390# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 419# CONFIG_LIB80211 is not set
392 420
393# 421#
@@ -503,6 +531,10 @@ CONFIG_BLK_DEV=y
503# CONFIG_BLK_DEV_COW_COMMON is not set 531# CONFIG_BLK_DEV_COW_COMMON is not set
504CONFIG_BLK_DEV_LOOP=y 532CONFIG_BLK_DEV_LOOP=y
505# CONFIG_BLK_DEV_CRYPTOLOOP is not set 533# CONFIG_BLK_DEV_CRYPTOLOOP is not set
534
535#
536# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
537#
506# CONFIG_BLK_DEV_NBD is not set 538# CONFIG_BLK_DEV_NBD is not set
507CONFIG_BLK_DEV_RAM=y 539CONFIG_BLK_DEV_RAM=y
508CONFIG_BLK_DEV_RAM_COUNT=16 540CONFIG_BLK_DEV_RAM_COUNT=16
@@ -603,8 +635,7 @@ CONFIG_GIANFAR=y
603# CONFIG_MV643XX_ETH is not set 635# CONFIG_MV643XX_ETH is not set
604CONFIG_NETDEV_10000=y 636CONFIG_NETDEV_10000=y
605CONFIG_WLAN=y 637CONFIG_WLAN=y
606# CONFIG_WLAN_PRE80211 is not set 638# CONFIG_HOSTAP is not set
607# CONFIG_WLAN_80211 is not set
608 639
609# 640#
610# Enable WiMAX (Networking options) to see the WiMAX drivers 641# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -624,6 +655,7 @@ CONFIG_WLAN=y
624CONFIG_INPUT=y 655CONFIG_INPUT=y
625# CONFIG_INPUT_FF_MEMLESS is not set 656# CONFIG_INPUT_FF_MEMLESS is not set
626# CONFIG_INPUT_POLLDEV is not set 657# CONFIG_INPUT_POLLDEV is not set
658# CONFIG_INPUT_SPARSEKMAP is not set
627 659
628# 660#
629# Userland interfaces 661# Userland interfaces
@@ -669,6 +701,7 @@ CONFIG_SERIAL_CORE=y
669CONFIG_SERIAL_CORE_CONSOLE=y 701CONFIG_SERIAL_CORE_CONSOLE=y
670CONFIG_SERIAL_CPM=y 702CONFIG_SERIAL_CPM=y
671CONFIG_SERIAL_CPM_CONSOLE=y 703CONFIG_SERIAL_CPM_CONSOLE=y
704# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
672CONFIG_UNIX98_PTYS=y 705CONFIG_UNIX98_PTYS=y
673# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 706# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
674CONFIG_LEGACY_PTYS=y 707CONFIG_LEGACY_PTYS=y
@@ -1051,7 +1084,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1051# CONFIG_KEYS is not set 1084# CONFIG_KEYS is not set
1052# CONFIG_SECURITY is not set 1085# CONFIG_SECURITY is not set
1053# CONFIG_SECURITYFS is not set 1086# CONFIG_SECURITYFS is not set
1054# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1087# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1088# CONFIG_DEFAULT_SECURITY_SMACK is not set
1089# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1090CONFIG_DEFAULT_SECURITY_DAC=y
1091CONFIG_DEFAULT_SECURITY=""
1055CONFIG_CRYPTO=y 1092CONFIG_CRYPTO=y
1056 1093
1057# 1094#
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
index c10e26f8763f..5db54cd274c6 100644
--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:33 2009 4# Wed Jan 6 09:24:27 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -170,14 +174,41 @@ CONFIG_LBDAF=y
170# IO Schedulers 174# IO Schedulers
171# 175#
172CONFIG_IOSCHED_NOOP=y 176CONFIG_IOSCHED_NOOP=y
173CONFIG_IOSCHED_AS=y
174CONFIG_IOSCHED_DEADLINE=y 177CONFIG_IOSCHED_DEADLINE=y
175CONFIG_IOSCHED_CFQ=y 178CONFIG_IOSCHED_CFQ=y
176CONFIG_DEFAULT_AS=y
177# CONFIG_DEFAULT_DEADLINE is not set 179# CONFIG_DEFAULT_DEADLINE is not set
178# CONFIG_DEFAULT_CFQ is not set 180CONFIG_DEFAULT_CFQ=y
179# CONFIG_DEFAULT_NOOP is not set 181# CONFIG_DEFAULT_NOOP is not set
180CONFIG_DEFAULT_IOSCHED="anticipatory" 182CONFIG_DEFAULT_IOSCHED="cfq"
183# CONFIG_INLINE_SPIN_TRYLOCK is not set
184# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
185# CONFIG_INLINE_SPIN_LOCK is not set
186# CONFIG_INLINE_SPIN_LOCK_BH is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
189CONFIG_INLINE_SPIN_UNLOCK=y
190# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
191CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
192# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
193# CONFIG_INLINE_READ_TRYLOCK is not set
194# CONFIG_INLINE_READ_LOCK is not set
195# CONFIG_INLINE_READ_LOCK_BH is not set
196# CONFIG_INLINE_READ_LOCK_IRQ is not set
197# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
198CONFIG_INLINE_READ_UNLOCK=y
199# CONFIG_INLINE_READ_UNLOCK_BH is not set
200CONFIG_INLINE_READ_UNLOCK_IRQ=y
201# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
202# CONFIG_INLINE_WRITE_TRYLOCK is not set
203# CONFIG_INLINE_WRITE_LOCK is not set
204# CONFIG_INLINE_WRITE_LOCK_BH is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
207CONFIG_INLINE_WRITE_UNLOCK=y
208# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
209CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
210# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
211# CONFIG_MUTEX_SPIN_ON_OWNER is not set
181# CONFIG_FREEZER is not set 212# CONFIG_FREEZER is not set
182 213
183# 214#
@@ -186,7 +217,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
186# CONFIG_PPC_CELL is not set 217# CONFIG_PPC_CELL is not set
187# CONFIG_PPC_CELL_NATIVE is not set 218# CONFIG_PPC_CELL_NATIVE is not set
188# CONFIG_PQ2ADS is not set 219# CONFIG_PQ2ADS is not set
189CONFIG_MPC85xx=y 220CONFIG_FSL_SOC_BOOKE=y
190CONFIG_MPC8540_ADS=y 221CONFIG_MPC8540_ADS=y
191# CONFIG_MPC8560_ADS is not set 222# CONFIG_MPC8560_ADS is not set
192# CONFIG_MPC85xx_CDS is not set 223# CONFIG_MPC85xx_CDS is not set
@@ -205,6 +236,7 @@ CONFIG_MPC8540_ADS=y
205# CONFIG_TQM8560 is not set 236# CONFIG_TQM8560 is not set
206# CONFIG_SBC8548 is not set 237# CONFIG_SBC8548 is not set
207# CONFIG_SBC8560 is not set 238# CONFIG_SBC8560 is not set
239# CONFIG_P4080_DS is not set
208# CONFIG_IPIC is not set 240# CONFIG_IPIC is not set
209CONFIG_MPIC=y 241CONFIG_MPIC=y
210# CONFIG_MPIC_WEIRD is not set 242# CONFIG_MPIC_WEIRD is not set
@@ -249,6 +281,7 @@ CONFIG_MATH_EMULATION=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 281CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
250CONFIG_ARCH_HAS_WALK_MEMORY=y 282CONFIG_ARCH_HAS_WALK_MEMORY=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
284CONFIG_SPARSE_IRQ=y
252CONFIG_MAX_ACTIVE_REGIONS=32 285CONFIG_MAX_ACTIVE_REGIONS=32
253CONFIG_ARCH_FLATMEM_ENABLE=y 286CONFIG_ARCH_FLATMEM_ENABLE=y
254CONFIG_ARCH_POPULATES_NODE_MAP=y 287CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -265,8 +298,6 @@ CONFIG_MIGRATION=y
265CONFIG_ZONE_DMA_FLAG=1 298CONFIG_ZONE_DMA_FLAG=1
266CONFIG_BOUNCE=y 299CONFIG_BOUNCE=y
267CONFIG_VIRT_TO_BUS=y 300CONFIG_VIRT_TO_BUS=y
268CONFIG_HAVE_MLOCK=y
269CONFIG_HAVE_MLOCKED_PAGE_BIT=y
270# CONFIG_KSM is not set 301# CONFIG_KSM is not set
271CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 302CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
272CONFIG_PPC_4K_PAGES=y 303CONFIG_PPC_4K_PAGES=y
@@ -386,9 +417,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
386# CONFIG_AF_RXRPC is not set 417# CONFIG_AF_RXRPC is not set
387CONFIG_WIRELESS=y 418CONFIG_WIRELESS=y
388# CONFIG_CFG80211 is not set 419# CONFIG_CFG80211 is not set
389CONFIG_CFG80211_DEFAULT_PS_VALUE=0
390CONFIG_WIRELESS_OLD_REGULATORY=y
391# CONFIG_WIRELESS_EXT is not set
392# CONFIG_LIB80211 is not set 420# CONFIG_LIB80211 is not set
393 421
394# 422#
@@ -423,6 +451,10 @@ CONFIG_BLK_DEV=y
423# CONFIG_BLK_DEV_COW_COMMON is not set 451# CONFIG_BLK_DEV_COW_COMMON is not set
424CONFIG_BLK_DEV_LOOP=y 452CONFIG_BLK_DEV_LOOP=y
425# CONFIG_BLK_DEV_CRYPTOLOOP is not set 453# CONFIG_BLK_DEV_CRYPTOLOOP is not set
454
455#
456# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
457#
426# CONFIG_BLK_DEV_NBD is not set 458# CONFIG_BLK_DEV_NBD is not set
427CONFIG_BLK_DEV_RAM=y 459CONFIG_BLK_DEV_RAM=y
428CONFIG_BLK_DEV_RAM_COUNT=16 460CONFIG_BLK_DEV_RAM_COUNT=16
@@ -500,8 +532,7 @@ CONFIG_GIANFAR=y
500# CONFIG_MV643XX_ETH is not set 532# CONFIG_MV643XX_ETH is not set
501CONFIG_NETDEV_10000=y 533CONFIG_NETDEV_10000=y
502CONFIG_WLAN=y 534CONFIG_WLAN=y
503# CONFIG_WLAN_PRE80211 is not set 535# CONFIG_HOSTAP is not set
504# CONFIG_WLAN_80211 is not set
505 536
506# 537#
507# Enable WiMAX (Networking options) to see the WiMAX drivers 538# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -521,6 +552,7 @@ CONFIG_WLAN=y
521CONFIG_INPUT=y 552CONFIG_INPUT=y
522# CONFIG_INPUT_FF_MEMLESS is not set 553# CONFIG_INPUT_FF_MEMLESS is not set
523# CONFIG_INPUT_POLLDEV is not set 554# CONFIG_INPUT_POLLDEV is not set
555# CONFIG_INPUT_SPARSEKMAP is not set
524 556
525# 557#
526# Userland interfaces 558# Userland interfaces
@@ -570,6 +602,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
570CONFIG_SERIAL_CORE=y 602CONFIG_SERIAL_CORE=y
571CONFIG_SERIAL_CORE_CONSOLE=y 603CONFIG_SERIAL_CORE_CONSOLE=y
572# CONFIG_SERIAL_OF_PLATFORM is not set 604# CONFIG_SERIAL_OF_PLATFORM is not set
605# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
573CONFIG_UNIX98_PTYS=y 606CONFIG_UNIX98_PTYS=y
574# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 607# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
575CONFIG_LEGACY_PTYS=y 608CONFIG_LEGACY_PTYS=y
@@ -920,7 +953,11 @@ CONFIG_PRINT_STACK_DEPTH=64
920# CONFIG_KEYS is not set 953# CONFIG_KEYS is not set
921# CONFIG_SECURITY is not set 954# CONFIG_SECURITY is not set
922# CONFIG_SECURITYFS is not set 955# CONFIG_SECURITYFS is not set
923# CONFIG_SECURITY_FILE_CAPABILITIES is not set 956# CONFIG_DEFAULT_SECURITY_SELINUX is not set
957# CONFIG_DEFAULT_SECURITY_SMACK is not set
958# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
959CONFIG_DEFAULT_SECURITY_DAC=y
960CONFIG_DEFAULT_SECURITY=""
924CONFIG_CRYPTO=y 961CONFIG_CRYPTO=y
925 962
926# 963#
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
index 8d9f0a4b5205..76c7018c5cd2 100644
--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:34 2009 4# Wed Jan 6 09:24:28 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,14 +177,41 @@ CONFIG_LBDAF=y
173# IO Schedulers 177# IO Schedulers
174# 178#
175CONFIG_IOSCHED_NOOP=y 179CONFIG_IOSCHED_NOOP=y
176CONFIG_IOSCHED_AS=y
177CONFIG_IOSCHED_DEADLINE=y 180CONFIG_IOSCHED_DEADLINE=y
178CONFIG_IOSCHED_CFQ=y 181CONFIG_IOSCHED_CFQ=y
179CONFIG_DEFAULT_AS=y
180# CONFIG_DEFAULT_DEADLINE is not set 182# CONFIG_DEFAULT_DEADLINE is not set
181# CONFIG_DEFAULT_CFQ is not set 183CONFIG_DEFAULT_CFQ=y
182# CONFIG_DEFAULT_NOOP is not set 184# CONFIG_DEFAULT_NOOP is not set
183CONFIG_DEFAULT_IOSCHED="anticipatory" 185CONFIG_DEFAULT_IOSCHED="cfq"
186# CONFIG_INLINE_SPIN_TRYLOCK is not set
187# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK is not set
189# CONFIG_INLINE_SPIN_LOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
192CONFIG_INLINE_SPIN_UNLOCK=y
193# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
194CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
195# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_READ_TRYLOCK is not set
197# CONFIG_INLINE_READ_LOCK is not set
198# CONFIG_INLINE_READ_LOCK_BH is not set
199# CONFIG_INLINE_READ_LOCK_IRQ is not set
200# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
201CONFIG_INLINE_READ_UNLOCK=y
202# CONFIG_INLINE_READ_UNLOCK_BH is not set
203CONFIG_INLINE_READ_UNLOCK_IRQ=y
204# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_WRITE_TRYLOCK is not set
206# CONFIG_INLINE_WRITE_LOCK is not set
207# CONFIG_INLINE_WRITE_LOCK_BH is not set
208# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
210CONFIG_INLINE_WRITE_UNLOCK=y
211# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
212CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
213# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
214# CONFIG_MUTEX_SPIN_ON_OWNER is not set
184# CONFIG_FREEZER is not set 215# CONFIG_FREEZER is not set
185 216
186# 217#
@@ -189,7 +220,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
189# CONFIG_PPC_CELL is not set 220# CONFIG_PPC_CELL is not set
190# CONFIG_PPC_CELL_NATIVE is not set 221# CONFIG_PPC_CELL_NATIVE is not set
191# CONFIG_PQ2ADS is not set 222# CONFIG_PQ2ADS is not set
192CONFIG_MPC85xx=y 223CONFIG_FSL_SOC_BOOKE=y
193# CONFIG_MPC8540_ADS is not set 224# CONFIG_MPC8540_ADS is not set
194CONFIG_MPC8560_ADS=y 225CONFIG_MPC8560_ADS=y
195# CONFIG_MPC85xx_CDS is not set 226# CONFIG_MPC85xx_CDS is not set
@@ -208,6 +239,7 @@ CONFIG_MPC8560_ADS=y
208# CONFIG_TQM8560 is not set 239# CONFIG_TQM8560 is not set
209# CONFIG_SBC8548 is not set 240# CONFIG_SBC8548 is not set
210# CONFIG_SBC8560 is not set 241# CONFIG_SBC8560 is not set
242# CONFIG_P4080_DS is not set
211# CONFIG_IPIC is not set 243# CONFIG_IPIC is not set
212CONFIG_MPIC=y 244CONFIG_MPIC=y
213# CONFIG_MPIC_WEIRD is not set 245# CONFIG_MPIC_WEIRD is not set
@@ -252,6 +284,7 @@ CONFIG_MATH_EMULATION=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
253CONFIG_ARCH_HAS_WALK_MEMORY=y 285CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
287CONFIG_SPARSE_IRQ=y
255CONFIG_MAX_ACTIVE_REGIONS=32 288CONFIG_MAX_ACTIVE_REGIONS=32
256CONFIG_ARCH_FLATMEM_ENABLE=y 289CONFIG_ARCH_FLATMEM_ENABLE=y
257CONFIG_ARCH_POPULATES_NODE_MAP=y 290CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -268,8 +301,6 @@ CONFIG_MIGRATION=y
268CONFIG_ZONE_DMA_FLAG=1 301CONFIG_ZONE_DMA_FLAG=1
269CONFIG_BOUNCE=y 302CONFIG_BOUNCE=y
270CONFIG_VIRT_TO_BUS=y 303CONFIG_VIRT_TO_BUS=y
271CONFIG_HAVE_MLOCK=y
272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set 304# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 305CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 306CONFIG_PPC_4K_PAGES=y
@@ -398,9 +429,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
398# CONFIG_AF_RXRPC is not set 429# CONFIG_AF_RXRPC is not set
399CONFIG_WIRELESS=y 430CONFIG_WIRELESS=y
400# CONFIG_CFG80211 is not set 431# CONFIG_CFG80211 is not set
401CONFIG_CFG80211_DEFAULT_PS_VALUE=0
402CONFIG_WIRELESS_OLD_REGULATORY=y
403# CONFIG_WIRELESS_EXT is not set
404# CONFIG_LIB80211 is not set 432# CONFIG_LIB80211 is not set
405 433
406# 434#
@@ -440,6 +468,10 @@ CONFIG_BLK_DEV=y
440# CONFIG_BLK_DEV_COW_COMMON is not set 468# CONFIG_BLK_DEV_COW_COMMON is not set
441CONFIG_BLK_DEV_LOOP=y 469CONFIG_BLK_DEV_LOOP=y
442# CONFIG_BLK_DEV_CRYPTOLOOP is not set 470# CONFIG_BLK_DEV_CRYPTOLOOP is not set
471
472#
473# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
474#
443# CONFIG_BLK_DEV_NBD is not set 475# CONFIG_BLK_DEV_NBD is not set
444# CONFIG_BLK_DEV_SX8 is not set 476# CONFIG_BLK_DEV_SX8 is not set
445CONFIG_BLK_DEV_RAM=y 477CONFIG_BLK_DEV_RAM=y
@@ -485,7 +517,7 @@ CONFIG_HAVE_IDE=y
485# 517#
486 518
487# 519#
488# See the help texts for more information. 520# The newer stack is recommended.
489# 521#
490# CONFIG_FIREWIRE is not set 522# CONFIG_FIREWIRE is not set
491# CONFIG_IEEE1394 is not set 523# CONFIG_IEEE1394 is not set
@@ -594,8 +626,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
594# CONFIG_BE2NET is not set 626# CONFIG_BE2NET is not set
595# CONFIG_TR is not set 627# CONFIG_TR is not set
596CONFIG_WLAN=y 628CONFIG_WLAN=y
597# CONFIG_WLAN_PRE80211 is not set 629# CONFIG_AIRO is not set
598# CONFIG_WLAN_80211 is not set 630# CONFIG_ATMEL is not set
631# CONFIG_PRISM54 is not set
632# CONFIG_HOSTAP is not set
599 633
600# 634#
601# Enable WiMAX (Networking options) to see the WiMAX drivers 635# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -608,6 +642,7 @@ CONFIG_WLAN=y
608# CONFIG_NETCONSOLE is not set 642# CONFIG_NETCONSOLE is not set
609# CONFIG_NETPOLL is not set 643# CONFIG_NETPOLL is not set
610# CONFIG_NET_POLL_CONTROLLER is not set 644# CONFIG_NET_POLL_CONTROLLER is not set
645# CONFIG_VMXNET3 is not set
611# CONFIG_ISDN is not set 646# CONFIG_ISDN is not set
612# CONFIG_PHONE is not set 647# CONFIG_PHONE is not set
613 648
@@ -617,6 +652,7 @@ CONFIG_WLAN=y
617CONFIG_INPUT=y 652CONFIG_INPUT=y
618# CONFIG_INPUT_FF_MEMLESS is not set 653# CONFIG_INPUT_FF_MEMLESS is not set
619# CONFIG_INPUT_POLLDEV is not set 654# CONFIG_INPUT_POLLDEV is not set
655# CONFIG_INPUT_SPARSEKMAP is not set
620 656
621# 657#
622# Userland interfaces 658# Userland interfaces
@@ -664,6 +700,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
664CONFIG_SERIAL_CPM=y 700CONFIG_SERIAL_CPM=y
665CONFIG_SERIAL_CPM_CONSOLE=y 701CONFIG_SERIAL_CPM_CONSOLE=y
666# CONFIG_SERIAL_JSM is not set 702# CONFIG_SERIAL_JSM is not set
703# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
667CONFIG_UNIX98_PTYS=y 704CONFIG_UNIX98_PTYS=y
668# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 705# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
669CONFIG_LEGACY_PTYS=y 706CONFIG_LEGACY_PTYS=y
@@ -705,6 +742,7 @@ CONFIG_GPIOLIB=y
705# 742#
706# PCI GPIO expanders: 743# PCI GPIO expanders:
707# 744#
745# CONFIG_GPIO_CS5535 is not set
708# CONFIG_GPIO_BT8XX is not set 746# CONFIG_GPIO_BT8XX is not set
709# CONFIG_GPIO_LANGWELL is not set 747# CONFIG_GPIO_LANGWELL is not set
710 748
@@ -1054,7 +1092,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1054# CONFIG_KEYS is not set 1092# CONFIG_KEYS is not set
1055# CONFIG_SECURITY is not set 1093# CONFIG_SECURITY is not set
1056# CONFIG_SECURITYFS is not set 1094# CONFIG_SECURITYFS is not set
1057# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1095# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1096# CONFIG_DEFAULT_SECURITY_SMACK is not set
1097# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1098CONFIG_DEFAULT_SECURITY_DAC=y
1099CONFIG_DEFAULT_SECURITY=""
1058CONFIG_CRYPTO=y 1100CONFIG_CRYPTO=y
1059 1101
1060# 1102#
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
index 9b63e258dac6..fab8adacbf79 100644
--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:35 2009 4# Wed Jan 6 09:24:29 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +175,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 175# IO Schedulers
172# 176#
173CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
183 214
184# 215#
@@ -187,7 +218,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
187# CONFIG_PPC_CELL is not set 218# CONFIG_PPC_CELL is not set
188# CONFIG_PPC_CELL_NATIVE is not set 219# CONFIG_PPC_CELL_NATIVE is not set
189# CONFIG_PQ2ADS is not set 220# CONFIG_PQ2ADS is not set
190CONFIG_MPC85xx=y 221CONFIG_FSL_SOC_BOOKE=y
191# CONFIG_MPC8540_ADS is not set 222# CONFIG_MPC8540_ADS is not set
192# CONFIG_MPC8560_ADS is not set 223# CONFIG_MPC8560_ADS is not set
193CONFIG_MPC85xx_CDS=y 224CONFIG_MPC85xx_CDS=y
@@ -206,6 +237,7 @@ CONFIG_MPC85xx_CDS=y
206# CONFIG_TQM8560 is not set 237# CONFIG_TQM8560 is not set
207# CONFIG_SBC8548 is not set 238# CONFIG_SBC8548 is not set
208# CONFIG_SBC8560 is not set 239# CONFIG_SBC8560 is not set
240# CONFIG_P4080_DS is not set
209# CONFIG_IPIC is not set 241# CONFIG_IPIC is not set
210CONFIG_MPIC=y 242CONFIG_MPIC=y
211# CONFIG_MPIC_WEIRD is not set 243# CONFIG_MPIC_WEIRD is not set
@@ -250,6 +282,7 @@ CONFIG_MATH_EMULATION=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 282CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
251CONFIG_ARCH_HAS_WALK_MEMORY=y 283CONFIG_ARCH_HAS_WALK_MEMORY=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
285CONFIG_SPARSE_IRQ=y
253CONFIG_MAX_ACTIVE_REGIONS=32 286CONFIG_MAX_ACTIVE_REGIONS=32
254CONFIG_ARCH_FLATMEM_ENABLE=y 287CONFIG_ARCH_FLATMEM_ENABLE=y
255CONFIG_ARCH_POPULATES_NODE_MAP=y 288CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -266,8 +299,6 @@ CONFIG_MIGRATION=y
266CONFIG_ZONE_DMA_FLAG=1 299CONFIG_ZONE_DMA_FLAG=1
267CONFIG_BOUNCE=y 300CONFIG_BOUNCE=y
268CONFIG_VIRT_TO_BUS=y 301CONFIG_VIRT_TO_BUS=y
269CONFIG_HAVE_MLOCK=y
270CONFIG_HAVE_MLOCKED_PAGE_BIT=y
271# CONFIG_KSM is not set 302# CONFIG_KSM is not set
272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 303CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
273CONFIG_PPC_4K_PAGES=y 304CONFIG_PPC_4K_PAGES=y
@@ -396,9 +427,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
396# CONFIG_AF_RXRPC is not set 427# CONFIG_AF_RXRPC is not set
397CONFIG_WIRELESS=y 428CONFIG_WIRELESS=y
398# CONFIG_CFG80211 is not set 429# CONFIG_CFG80211 is not set
399CONFIG_CFG80211_DEFAULT_PS_VALUE=0
400CONFIG_WIRELESS_OLD_REGULATORY=y
401# CONFIG_WIRELESS_EXT is not set
402# CONFIG_LIB80211 is not set 430# CONFIG_LIB80211 is not set
403 431
404# 432#
@@ -437,6 +465,10 @@ CONFIG_BLK_DEV=y
437# CONFIG_BLK_DEV_COW_COMMON is not set 465# CONFIG_BLK_DEV_COW_COMMON is not set
438CONFIG_BLK_DEV_LOOP=y 466CONFIG_BLK_DEV_LOOP=y
439# CONFIG_BLK_DEV_CRYPTOLOOP is not set 467# CONFIG_BLK_DEV_CRYPTOLOOP is not set
468
469#
470# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
471#
440# CONFIG_BLK_DEV_NBD is not set 472# CONFIG_BLK_DEV_NBD is not set
441# CONFIG_BLK_DEV_SX8 is not set 473# CONFIG_BLK_DEV_SX8 is not set
442CONFIG_BLK_DEV_RAM=y 474CONFIG_BLK_DEV_RAM=y
@@ -537,7 +569,7 @@ CONFIG_BLK_DEV_IDEDMA=y
537# 569#
538 570
539# 571#
540# See the help texts for more information. 572# The newer stack is recommended.
541# 573#
542# CONFIG_FIREWIRE is not set 574# CONFIG_FIREWIRE is not set
543# CONFIG_IEEE1394 is not set 575# CONFIG_IEEE1394 is not set
@@ -642,8 +674,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
642# CONFIG_BE2NET is not set 674# CONFIG_BE2NET is not set
643# CONFIG_TR is not set 675# CONFIG_TR is not set
644CONFIG_WLAN=y 676CONFIG_WLAN=y
645# CONFIG_WLAN_PRE80211 is not set 677# CONFIG_AIRO is not set
646# CONFIG_WLAN_80211 is not set 678# CONFIG_ATMEL is not set
679# CONFIG_PRISM54 is not set
680# CONFIG_HOSTAP is not set
647 681
648# 682#
649# Enable WiMAX (Networking options) to see the WiMAX drivers 683# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -656,6 +690,7 @@ CONFIG_WLAN=y
656# CONFIG_NETCONSOLE is not set 690# CONFIG_NETCONSOLE is not set
657# CONFIG_NETPOLL is not set 691# CONFIG_NETPOLL is not set
658# CONFIG_NET_POLL_CONTROLLER is not set 692# CONFIG_NET_POLL_CONTROLLER is not set
693# CONFIG_VMXNET3 is not set
659# CONFIG_ISDN is not set 694# CONFIG_ISDN is not set
660# CONFIG_PHONE is not set 695# CONFIG_PHONE is not set
661 696
@@ -665,6 +700,7 @@ CONFIG_WLAN=y
665CONFIG_INPUT=y 700CONFIG_INPUT=y
666# CONFIG_INPUT_FF_MEMLESS is not set 701# CONFIG_INPUT_FF_MEMLESS is not set
667# CONFIG_INPUT_POLLDEV is not set 702# CONFIG_INPUT_POLLDEV is not set
703# CONFIG_INPUT_SPARSEKMAP is not set
668 704
669# 705#
670# Userland interfaces 706# Userland interfaces
@@ -717,6 +753,7 @@ CONFIG_SERIAL_CORE=y
717CONFIG_SERIAL_CORE_CONSOLE=y 753CONFIG_SERIAL_CORE_CONSOLE=y
718# CONFIG_SERIAL_JSM is not set 754# CONFIG_SERIAL_JSM is not set
719# CONFIG_SERIAL_OF_PLATFORM is not set 755# CONFIG_SERIAL_OF_PLATFORM is not set
756# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
720CONFIG_UNIX98_PTYS=y 757CONFIG_UNIX98_PTYS=y
721# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
722CONFIG_LEGACY_PTYS=y 759CONFIG_LEGACY_PTYS=y
@@ -1079,7 +1116,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1079# CONFIG_KEYS is not set 1116# CONFIG_KEYS is not set
1080# CONFIG_SECURITY is not set 1117# CONFIG_SECURITY is not set
1081# CONFIG_SECURITYFS is not set 1118# CONFIG_SECURITYFS is not set
1082# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1119# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1120# CONFIG_DEFAULT_SECURITY_SMACK is not set
1121# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1122CONFIG_DEFAULT_SECURITY_DAC=y
1123CONFIG_DEFAULT_SECURITY=""
1083CONFIG_CRYPTO=y 1124CONFIG_CRYPTO=y
1084 1125
1085# 1126#
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig
index 1b2356830173..8290385e9b94 100644
--- a/arch/powerpc/configs/85xx/sbc8548_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8548_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:36 2009 4# Wed Jan 6 09:24:29 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -169,14 +173,41 @@ CONFIG_LBDAF=y
169# IO Schedulers 173# IO Schedulers
170# 174#
171CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
175CONFIG_DEFAULT_AS=y
176# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
177# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
178# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
179CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
180# CONFIG_FREEZER is not set 211# CONFIG_FREEZER is not set
181 212
182# 213#
@@ -185,7 +216,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
185# CONFIG_PPC_CELL is not set 216# CONFIG_PPC_CELL is not set
186# CONFIG_PPC_CELL_NATIVE is not set 217# CONFIG_PPC_CELL_NATIVE is not set
187# CONFIG_PQ2ADS is not set 218# CONFIG_PQ2ADS is not set
188CONFIG_MPC85xx=y 219CONFIG_FSL_SOC_BOOKE=y
189# CONFIG_MPC8540_ADS is not set 220# CONFIG_MPC8540_ADS is not set
190# CONFIG_MPC8560_ADS is not set 221# CONFIG_MPC8560_ADS is not set
191# CONFIG_MPC85xx_CDS is not set 222# CONFIG_MPC85xx_CDS is not set
@@ -204,6 +235,7 @@ CONFIG_MPC85xx=y
204# CONFIG_TQM8560 is not set 235# CONFIG_TQM8560 is not set
205CONFIG_SBC8548=y 236CONFIG_SBC8548=y
206# CONFIG_SBC8560 is not set 237# CONFIG_SBC8560 is not set
238# CONFIG_P4080_DS is not set
207# CONFIG_IPIC is not set 239# CONFIG_IPIC is not set
208CONFIG_MPIC=y 240CONFIG_MPIC=y
209# CONFIG_MPIC_WEIRD is not set 241# CONFIG_MPIC_WEIRD is not set
@@ -247,6 +279,7 @@ CONFIG_MATH_EMULATION=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 279CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
248CONFIG_ARCH_HAS_WALK_MEMORY=y 280CONFIG_ARCH_HAS_WALK_MEMORY=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 281CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
282CONFIG_SPARSE_IRQ=y
250CONFIG_MAX_ACTIVE_REGIONS=32 283CONFIG_MAX_ACTIVE_REGIONS=32
251CONFIG_ARCH_FLATMEM_ENABLE=y 284CONFIG_ARCH_FLATMEM_ENABLE=y
252CONFIG_ARCH_POPULATES_NODE_MAP=y 285CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -263,8 +296,6 @@ CONFIG_MIGRATION=y
263CONFIG_ZONE_DMA_FLAG=1 296CONFIG_ZONE_DMA_FLAG=1
264CONFIG_BOUNCE=y 297CONFIG_BOUNCE=y
265CONFIG_VIRT_TO_BUS=y 298CONFIG_VIRT_TO_BUS=y
266CONFIG_HAVE_MLOCK=y
267CONFIG_HAVE_MLOCKED_PAGE_BIT=y
268# CONFIG_KSM is not set 299# CONFIG_KSM is not set
269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 300CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
270CONFIG_PPC_4K_PAGES=y 301CONFIG_PPC_4K_PAGES=y
@@ -392,9 +423,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
392# CONFIG_AF_RXRPC is not set 423# CONFIG_AF_RXRPC is not set
393CONFIG_WIRELESS=y 424CONFIG_WIRELESS=y
394# CONFIG_CFG80211 is not set 425# CONFIG_CFG80211 is not set
395CONFIG_CFG80211_DEFAULT_PS_VALUE=0
396CONFIG_WIRELESS_OLD_REGULATORY=y
397# CONFIG_WIRELESS_EXT is not set
398# CONFIG_LIB80211 is not set 426# CONFIG_LIB80211 is not set
399 427
400# 428#
@@ -431,6 +459,10 @@ CONFIG_BLK_DEV=y
431# CONFIG_BLK_DEV_COW_COMMON is not set 459# CONFIG_BLK_DEV_COW_COMMON is not set
432CONFIG_BLK_DEV_LOOP=y 460CONFIG_BLK_DEV_LOOP=y
433# CONFIG_BLK_DEV_CRYPTOLOOP is not set 461# CONFIG_BLK_DEV_CRYPTOLOOP is not set
462
463#
464# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
465#
434# CONFIG_BLK_DEV_NBD is not set 466# CONFIG_BLK_DEV_NBD is not set
435# CONFIG_BLK_DEV_SX8 is not set 467# CONFIG_BLK_DEV_SX8 is not set
436CONFIG_BLK_DEV_RAM=y 468CONFIG_BLK_DEV_RAM=y
@@ -476,7 +508,7 @@ CONFIG_HAVE_IDE=y
476# 508#
477 509
478# 510#
479# See the help texts for more information. 511# The newer stack is recommended.
480# 512#
481# CONFIG_FIREWIRE is not set 513# CONFIG_FIREWIRE is not set
482# CONFIG_IEEE1394 is not set 514# CONFIG_IEEE1394 is not set
@@ -581,8 +613,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
581# CONFIG_BE2NET is not set 613# CONFIG_BE2NET is not set
582# CONFIG_TR is not set 614# CONFIG_TR is not set
583CONFIG_WLAN=y 615CONFIG_WLAN=y
584# CONFIG_WLAN_PRE80211 is not set 616# CONFIG_AIRO is not set
585# CONFIG_WLAN_80211 is not set 617# CONFIG_ATMEL is not set
618# CONFIG_PRISM54 is not set
619# CONFIG_HOSTAP is not set
586 620
587# 621#
588# Enable WiMAX (Networking options) to see the WiMAX drivers 622# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -595,6 +629,7 @@ CONFIG_WLAN=y
595# CONFIG_NETCONSOLE is not set 629# CONFIG_NETCONSOLE is not set
596# CONFIG_NETPOLL is not set 630# CONFIG_NETPOLL is not set
597# CONFIG_NET_POLL_CONTROLLER is not set 631# CONFIG_NET_POLL_CONTROLLER is not set
632# CONFIG_VMXNET3 is not set
598# CONFIG_ISDN is not set 633# CONFIG_ISDN is not set
599# CONFIG_PHONE is not set 634# CONFIG_PHONE is not set
600 635
@@ -604,6 +639,7 @@ CONFIG_WLAN=y
604CONFIG_INPUT=y 639CONFIG_INPUT=y
605# CONFIG_INPUT_FF_MEMLESS is not set 640# CONFIG_INPUT_FF_MEMLESS is not set
606# CONFIG_INPUT_POLLDEV is not set 641# CONFIG_INPUT_POLLDEV is not set
642# CONFIG_INPUT_SPARSEKMAP is not set
607 643
608# 644#
609# Userland interfaces 645# Userland interfaces
@@ -656,6 +692,7 @@ CONFIG_SERIAL_CORE=y
656CONFIG_SERIAL_CORE_CONSOLE=y 692CONFIG_SERIAL_CORE_CONSOLE=y
657# CONFIG_SERIAL_JSM is not set 693# CONFIG_SERIAL_JSM is not set
658# CONFIG_SERIAL_OF_PLATFORM is not set 694# CONFIG_SERIAL_OF_PLATFORM is not set
695# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
659CONFIG_UNIX98_PTYS=y 696CONFIG_UNIX98_PTYS=y
660# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 697# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
661CONFIG_LEGACY_PTYS=y 698CONFIG_LEGACY_PTYS=y
@@ -889,7 +926,7 @@ CONFIG_FRAME_WARN=1024
889# CONFIG_DEBUG_FS is not set 926# CONFIG_DEBUG_FS is not set
890# CONFIG_HEADERS_CHECK is not set 927# CONFIG_HEADERS_CHECK is not set
891# CONFIG_DEBUG_KERNEL is not set 928# CONFIG_DEBUG_KERNEL is not set
892# CONFIG_DEBUG_BUGVERBOSE is not set 929CONFIG_DEBUG_BUGVERBOSE=y
893# CONFIG_DEBUG_MEMORY_INIT is not set 930# CONFIG_DEBUG_MEMORY_INIT is not set
894# CONFIG_RCU_CPU_STALL_DETECTOR is not set 931# CONFIG_RCU_CPU_STALL_DETECTOR is not set
895# CONFIG_LATENCYTOP is not set 932# CONFIG_LATENCYTOP is not set
@@ -915,7 +952,11 @@ CONFIG_PRINT_STACK_DEPTH=64
915# CONFIG_KEYS is not set 952# CONFIG_KEYS is not set
916# CONFIG_SECURITY is not set 953# CONFIG_SECURITY is not set
917# CONFIG_SECURITYFS is not set 954# CONFIG_SECURITYFS is not set
918# CONFIG_SECURITY_FILE_CAPABILITIES is not set 955# CONFIG_DEFAULT_SECURITY_SELINUX is not set
956# CONFIG_DEFAULT_SECURITY_SMACK is not set
957# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
958CONFIG_DEFAULT_SECURITY_DAC=y
959CONFIG_DEFAULT_SECURITY=""
919CONFIG_CRYPTO=y 960CONFIG_CRYPTO=y
920 961
921# 962#
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig
index 959d0281431b..2499b5ba7141 100644
--- a/arch/powerpc/configs/85xx/sbc8560_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8560_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:37 2009 4# Wed Jan 6 09:24:30 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -169,14 +173,41 @@ CONFIG_LBDAF=y
169# IO Schedulers 173# IO Schedulers
170# 174#
171CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
175CONFIG_DEFAULT_AS=y
176# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
177# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
178# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
179CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
180# CONFIG_FREEZER is not set 211# CONFIG_FREEZER is not set
181 212
182# 213#
@@ -185,7 +216,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
185# CONFIG_PPC_CELL is not set 216# CONFIG_PPC_CELL is not set
186# CONFIG_PPC_CELL_NATIVE is not set 217# CONFIG_PPC_CELL_NATIVE is not set
187# CONFIG_PQ2ADS is not set 218# CONFIG_PQ2ADS is not set
188CONFIG_MPC85xx=y 219CONFIG_FSL_SOC_BOOKE=y
189# CONFIG_MPC8540_ADS is not set 220# CONFIG_MPC8540_ADS is not set
190# CONFIG_MPC8560_ADS is not set 221# CONFIG_MPC8560_ADS is not set
191# CONFIG_MPC85xx_CDS is not set 222# CONFIG_MPC85xx_CDS is not set
@@ -204,6 +235,7 @@ CONFIG_MPC85xx=y
204# CONFIG_TQM8560 is not set 235# CONFIG_TQM8560 is not set
205# CONFIG_SBC8548 is not set 236# CONFIG_SBC8548 is not set
206CONFIG_SBC8560=y 237CONFIG_SBC8560=y
238# CONFIG_P4080_DS is not set
207# CONFIG_IPIC is not set 239# CONFIG_IPIC is not set
208CONFIG_MPIC=y 240CONFIG_MPIC=y
209# CONFIG_MPIC_WEIRD is not set 241# CONFIG_MPIC_WEIRD is not set
@@ -247,6 +279,7 @@ CONFIG_BINFMT_MISC=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 279CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
248CONFIG_ARCH_HAS_WALK_MEMORY=y 280CONFIG_ARCH_HAS_WALK_MEMORY=y
249CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 281CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
282CONFIG_SPARSE_IRQ=y
250CONFIG_MAX_ACTIVE_REGIONS=32 283CONFIG_MAX_ACTIVE_REGIONS=32
251CONFIG_ARCH_FLATMEM_ENABLE=y 284CONFIG_ARCH_FLATMEM_ENABLE=y
252CONFIG_ARCH_POPULATES_NODE_MAP=y 285CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -263,8 +296,6 @@ CONFIG_MIGRATION=y
263CONFIG_ZONE_DMA_FLAG=1 296CONFIG_ZONE_DMA_FLAG=1
264CONFIG_BOUNCE=y 297CONFIG_BOUNCE=y
265CONFIG_VIRT_TO_BUS=y 298CONFIG_VIRT_TO_BUS=y
266CONFIG_HAVE_MLOCK=y
267CONFIG_HAVE_MLOCKED_PAGE_BIT=y
268# CONFIG_KSM is not set 299# CONFIG_KSM is not set
269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 300CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
270CONFIG_PPC_4K_PAGES=y 301CONFIG_PPC_4K_PAGES=y
@@ -384,9 +415,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
385CONFIG_WIRELESS=y 416CONFIG_WIRELESS=y
386# CONFIG_CFG80211 is not set 417# CONFIG_CFG80211 is not set
387CONFIG_CFG80211_DEFAULT_PS_VALUE=0
388CONFIG_WIRELESS_OLD_REGULATORY=y
389# CONFIG_WIRELESS_EXT is not set
390# CONFIG_LIB80211 is not set 418# CONFIG_LIB80211 is not set
391 419
392# 420#
@@ -421,6 +449,10 @@ CONFIG_BLK_DEV=y
421# CONFIG_BLK_DEV_COW_COMMON is not set 449# CONFIG_BLK_DEV_COW_COMMON is not set
422CONFIG_BLK_DEV_LOOP=y 450CONFIG_BLK_DEV_LOOP=y
423# CONFIG_BLK_DEV_CRYPTOLOOP is not set 451# CONFIG_BLK_DEV_CRYPTOLOOP is not set
452
453#
454# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
455#
424# CONFIG_BLK_DEV_NBD is not set 456# CONFIG_BLK_DEV_NBD is not set
425CONFIG_BLK_DEV_RAM=y 457CONFIG_BLK_DEV_RAM=y
426CONFIG_BLK_DEV_RAM_COUNT=16 458CONFIG_BLK_DEV_RAM_COUNT=16
@@ -498,8 +530,7 @@ CONFIG_GIANFAR=y
498# CONFIG_MV643XX_ETH is not set 530# CONFIG_MV643XX_ETH is not set
499CONFIG_NETDEV_10000=y 531CONFIG_NETDEV_10000=y
500CONFIG_WLAN=y 532CONFIG_WLAN=y
501# CONFIG_WLAN_PRE80211 is not set 533# CONFIG_HOSTAP is not set
502# CONFIG_WLAN_80211 is not set
503 534
504# 535#
505# Enable WiMAX (Networking options) to see the WiMAX drivers 536# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -519,6 +550,7 @@ CONFIG_WLAN=y
519CONFIG_INPUT=y 550CONFIG_INPUT=y
520# CONFIG_INPUT_FF_MEMLESS is not set 551# CONFIG_INPUT_FF_MEMLESS is not set
521# CONFIG_INPUT_POLLDEV is not set 552# CONFIG_INPUT_POLLDEV is not set
553# CONFIG_INPUT_SPARSEKMAP is not set
522 554
523# 555#
524# Userland interfaces 556# Userland interfaces
@@ -568,6 +600,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
568CONFIG_SERIAL_CORE=y 600CONFIG_SERIAL_CORE=y
569CONFIG_SERIAL_CORE_CONSOLE=y 601CONFIG_SERIAL_CORE_CONSOLE=y
570# CONFIG_SERIAL_OF_PLATFORM is not set 602# CONFIG_SERIAL_OF_PLATFORM is not set
603# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
571CONFIG_UNIX98_PTYS=y 604CONFIG_UNIX98_PTYS=y
572# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 605# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
573CONFIG_LEGACY_PTYS=y 606CONFIG_LEGACY_PTYS=y
@@ -702,7 +735,9 @@ CONFIG_RTC_INTF_DEV=y
702# CONFIG_RTC_DRV_M48T86 is not set 735# CONFIG_RTC_DRV_M48T86 is not set
703# CONFIG_RTC_DRV_M48T35 is not set 736# CONFIG_RTC_DRV_M48T35 is not set
704CONFIG_RTC_DRV_M48T59=y 737CONFIG_RTC_DRV_M48T59=y
738# CONFIG_RTC_DRV_MSM6242 is not set
705# CONFIG_RTC_DRV_BQ4802 is not set 739# CONFIG_RTC_DRV_BQ4802 is not set
740# CONFIG_RTC_DRV_RP5C01 is not set
706# CONFIG_RTC_DRV_V3020 is not set 741# CONFIG_RTC_DRV_V3020 is not set
707 742
708# 743#
@@ -948,6 +983,7 @@ CONFIG_PPC_EARLY_DEBUG=y
948# CONFIG_PPC_EARLY_DEBUG_44x is not set 983# CONFIG_PPC_EARLY_DEBUG_44x is not set
949# CONFIG_PPC_EARLY_DEBUG_40x is not set 984# CONFIG_PPC_EARLY_DEBUG_40x is not set
950# CONFIG_PPC_EARLY_DEBUG_CPM is not set 985# CONFIG_PPC_EARLY_DEBUG_CPM is not set
986# CONFIG_PPC_EARLY_DEBUG_USBGECKO is not set
951 987
952# 988#
953# Security options 989# Security options
@@ -955,7 +991,11 @@ CONFIG_PPC_EARLY_DEBUG=y
955# CONFIG_KEYS is not set 991# CONFIG_KEYS is not set
956# CONFIG_SECURITY is not set 992# CONFIG_SECURITY is not set
957# CONFIG_SECURITYFS is not set 993# CONFIG_SECURITYFS is not set
958# CONFIG_SECURITY_FILE_CAPABILITIES is not set 994# CONFIG_DEFAULT_SECURITY_SELINUX is not set
995# CONFIG_DEFAULT_SECURITY_SMACK is not set
996# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
997CONFIG_DEFAULT_SECURITY_DAC=y
998CONFIG_DEFAULT_SECURITY=""
959CONFIG_CRYPTO=y 999CONFIG_CRYPTO=y
960 1000
961# 1001#
diff --git a/arch/powerpc/configs/85xx/socrates_defconfig b/arch/powerpc/configs/85xx/socrates_defconfig
index 7f5ec35bf199..e2edb79cfd1a 100644
--- a/arch/powerpc/configs/85xx/socrates_defconfig
+++ b/arch/powerpc/configs/85xx/socrates_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:37 2009 4# Wed Jan 6 09:24:31 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -174,14 +178,41 @@ CONFIG_LBDAF=y
174# IO Schedulers 178# IO Schedulers
175# 179#
176CONFIG_IOSCHED_NOOP=y 180CONFIG_IOSCHED_NOOP=y
177CONFIG_IOSCHED_AS=y
178CONFIG_IOSCHED_DEADLINE=y 181CONFIG_IOSCHED_DEADLINE=y
179CONFIG_IOSCHED_CFQ=y 182CONFIG_IOSCHED_CFQ=y
180CONFIG_DEFAULT_AS=y
181# CONFIG_DEFAULT_DEADLINE is not set 183# CONFIG_DEFAULT_DEADLINE is not set
182# CONFIG_DEFAULT_CFQ is not set 184CONFIG_DEFAULT_CFQ=y
183# CONFIG_DEFAULT_NOOP is not set 185# CONFIG_DEFAULT_NOOP is not set
184CONFIG_DEFAULT_IOSCHED="anticipatory" 186CONFIG_DEFAULT_IOSCHED="cfq"
187# CONFIG_INLINE_SPIN_TRYLOCK is not set
188# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK is not set
190# CONFIG_INLINE_SPIN_LOCK_BH is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
192# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
193CONFIG_INLINE_SPIN_UNLOCK=y
194# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
195CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
196# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_READ_TRYLOCK is not set
198# CONFIG_INLINE_READ_LOCK is not set
199# CONFIG_INLINE_READ_LOCK_BH is not set
200# CONFIG_INLINE_READ_LOCK_IRQ is not set
201# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
202CONFIG_INLINE_READ_UNLOCK=y
203# CONFIG_INLINE_READ_UNLOCK_BH is not set
204CONFIG_INLINE_READ_UNLOCK_IRQ=y
205# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
206# CONFIG_INLINE_WRITE_TRYLOCK is not set
207# CONFIG_INLINE_WRITE_LOCK is not set
208# CONFIG_INLINE_WRITE_LOCK_BH is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
210# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
211CONFIG_INLINE_WRITE_UNLOCK=y
212# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
213CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
214# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
215# CONFIG_MUTEX_SPIN_ON_OWNER is not set
185# CONFIG_FREEZER is not set 216# CONFIG_FREEZER is not set
186 217
187# 218#
@@ -190,7 +221,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
190# CONFIG_PPC_CELL is not set 221# CONFIG_PPC_CELL is not set
191# CONFIG_PPC_CELL_NATIVE is not set 222# CONFIG_PPC_CELL_NATIVE is not set
192# CONFIG_PQ2ADS is not set 223# CONFIG_PQ2ADS is not set
193CONFIG_MPC85xx=y 224CONFIG_FSL_SOC_BOOKE=y
194# CONFIG_MPC8540_ADS is not set 225# CONFIG_MPC8540_ADS is not set
195# CONFIG_MPC8560_ADS is not set 226# CONFIG_MPC8560_ADS is not set
196# CONFIG_MPC85xx_CDS is not set 227# CONFIG_MPC85xx_CDS is not set
@@ -209,6 +240,7 @@ CONFIG_SOCRATES=y
209# CONFIG_TQM8560 is not set 240# CONFIG_TQM8560 is not set
210# CONFIG_SBC8548 is not set 241# CONFIG_SBC8548 is not set
211# CONFIG_SBC8560 is not set 242# CONFIG_SBC8560 is not set
243# CONFIG_P4080_DS is not set
212# CONFIG_IPIC is not set 244# CONFIG_IPIC is not set
213CONFIG_MPIC=y 245CONFIG_MPIC=y
214# CONFIG_MPIC_WEIRD is not set 246# CONFIG_MPIC_WEIRD is not set
@@ -252,6 +284,7 @@ CONFIG_MATH_EMULATION=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
253CONFIG_ARCH_HAS_WALK_MEMORY=y 285CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
287CONFIG_SPARSE_IRQ=y
255CONFIG_MAX_ACTIVE_REGIONS=32 288CONFIG_MAX_ACTIVE_REGIONS=32
256CONFIG_ARCH_FLATMEM_ENABLE=y 289CONFIG_ARCH_FLATMEM_ENABLE=y
257CONFIG_ARCH_POPULATES_NODE_MAP=y 290CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -268,8 +301,6 @@ CONFIG_MIGRATION=y
268CONFIG_ZONE_DMA_FLAG=1 301CONFIG_ZONE_DMA_FLAG=1
269CONFIG_BOUNCE=y 302CONFIG_BOUNCE=y
270CONFIG_VIRT_TO_BUS=y 303CONFIG_VIRT_TO_BUS=y
271CONFIG_HAVE_MLOCK=y
272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set 304# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 305CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 306CONFIG_PPC_4K_PAGES=y
@@ -404,9 +435,6 @@ CONFIG_CAN_BCM=y
404# CONFIG_AF_RXRPC is not set 435# CONFIG_AF_RXRPC is not set
405CONFIG_WIRELESS=y 436CONFIG_WIRELESS=y
406# CONFIG_CFG80211 is not set 437# CONFIG_CFG80211 is not set
407CONFIG_CFG80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIRELESS_OLD_REGULATORY is not set
409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 438# CONFIG_LIB80211 is not set
411 439
412# 440#
@@ -540,6 +568,10 @@ CONFIG_BLK_DEV=y
540# CONFIG_BLK_DEV_COW_COMMON is not set 568# CONFIG_BLK_DEV_COW_COMMON is not set
541CONFIG_BLK_DEV_LOOP=y 569CONFIG_BLK_DEV_LOOP=y
542# CONFIG_BLK_DEV_CRYPTOLOOP is not set 570# CONFIG_BLK_DEV_CRYPTOLOOP is not set
571
572#
573# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
574#
543# CONFIG_BLK_DEV_NBD is not set 575# CONFIG_BLK_DEV_NBD is not set
544# CONFIG_BLK_DEV_SX8 is not set 576# CONFIG_BLK_DEV_SX8 is not set
545# CONFIG_BLK_DEV_UB is not set 577# CONFIG_BLK_DEV_UB is not set
@@ -551,6 +583,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
551# CONFIG_ATA_OVER_ETH is not set 583# CONFIG_ATA_OVER_ETH is not set
552# CONFIG_BLK_DEV_HD is not set 584# CONFIG_BLK_DEV_HD is not set
553CONFIG_MISC_DEVICES=y 585CONFIG_MISC_DEVICES=y
586# CONFIG_AD525X_DPOT is not set
554# CONFIG_PHANTOM is not set 587# CONFIG_PHANTOM is not set
555# CONFIG_SGI_IOC4 is not set 588# CONFIG_SGI_IOC4 is not set
556# CONFIG_TIFM_CORE is not set 589# CONFIG_TIFM_CORE is not set
@@ -558,6 +591,8 @@ CONFIG_MISC_DEVICES=y
558# CONFIG_ENCLOSURE_SERVICES is not set 591# CONFIG_ENCLOSURE_SERVICES is not set
559# CONFIG_HP_ILO is not set 592# CONFIG_HP_ILO is not set
560# CONFIG_ISL29003 is not set 593# CONFIG_ISL29003 is not set
594# CONFIG_DS1682 is not set
595# CONFIG_TI_DAC7512 is not set
561# CONFIG_C2PORT is not set 596# CONFIG_C2PORT is not set
562 597
563# 598#
@@ -621,7 +656,7 @@ CONFIG_SCSI_WAIT_SCAN=m
621# 656#
622 657
623# 658#
624# See the help texts for more information. 659# The newer stack is recommended.
625# 660#
626# CONFIG_FIREWIRE is not set 661# CONFIG_FIREWIRE is not set
627# CONFIG_IEEE1394 is not set 662# CONFIG_IEEE1394 is not set
@@ -710,8 +745,11 @@ CONFIG_GIANFAR=y
710# CONFIG_NETDEV_10000 is not set 745# CONFIG_NETDEV_10000 is not set
711# CONFIG_TR is not set 746# CONFIG_TR is not set
712CONFIG_WLAN=y 747CONFIG_WLAN=y
713# CONFIG_WLAN_PRE80211 is not set 748# CONFIG_AIRO is not set
714# CONFIG_WLAN_80211 is not set 749# CONFIG_ATMEL is not set
750# CONFIG_PRISM54 is not set
751# CONFIG_USB_ZD1201 is not set
752# CONFIG_HOSTAP is not set
715 753
716# 754#
717# Enable WiMAX (Networking options) to see the WiMAX drivers 755# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -734,6 +772,7 @@ CONFIG_WLAN=y
734# CONFIG_NETCONSOLE is not set 772# CONFIG_NETCONSOLE is not set
735# CONFIG_NETPOLL is not set 773# CONFIG_NETPOLL is not set
736# CONFIG_NET_POLL_CONTROLLER is not set 774# CONFIG_NET_POLL_CONTROLLER is not set
775# CONFIG_VMXNET3 is not set
737# CONFIG_ISDN is not set 776# CONFIG_ISDN is not set
738# CONFIG_PHONE is not set 777# CONFIG_PHONE is not set
739 778
@@ -743,6 +782,7 @@ CONFIG_WLAN=y
743CONFIG_INPUT=y 782CONFIG_INPUT=y
744# CONFIG_INPUT_FF_MEMLESS is not set 783# CONFIG_INPUT_FF_MEMLESS is not set
745# CONFIG_INPUT_POLLDEV is not set 784# CONFIG_INPUT_POLLDEV is not set
785# CONFIG_INPUT_SPARSEKMAP is not set
746 786
747# 787#
748# Userland interfaces 788# Userland interfaces
@@ -768,6 +808,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
768# CONFIG_TOUCHSCREEN_AD7879_I2C is not set 808# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
769# CONFIG_TOUCHSCREEN_AD7879_SPI is not set 809# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
770# CONFIG_TOUCHSCREEN_AD7879 is not set 810# CONFIG_TOUCHSCREEN_AD7879 is not set
811# CONFIG_TOUCHSCREEN_DYNAPRO is not set
771# CONFIG_TOUCHSCREEN_EETI is not set 812# CONFIG_TOUCHSCREEN_EETI is not set
772# CONFIG_TOUCHSCREEN_FUJITSU is not set 813# CONFIG_TOUCHSCREEN_FUJITSU is not set
773# CONFIG_TOUCHSCREEN_GUNZE is not set 814# CONFIG_TOUCHSCREEN_GUNZE is not set
@@ -826,6 +867,7 @@ CONFIG_SERIAL_CORE=y
826CONFIG_SERIAL_CORE_CONSOLE=y 867CONFIG_SERIAL_CORE_CONSOLE=y
827# CONFIG_SERIAL_JSM is not set 868# CONFIG_SERIAL_JSM is not set
828# CONFIG_SERIAL_OF_PLATFORM is not set 869# CONFIG_SERIAL_OF_PLATFORM is not set
870# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
829CONFIG_UNIX98_PTYS=y 871CONFIG_UNIX98_PTYS=y
830# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 872# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
831CONFIG_LEGACY_PTYS=y 873CONFIG_LEGACY_PTYS=y
@@ -883,11 +925,6 @@ CONFIG_I2C_MPC=y
883# CONFIG_I2C_TINY_USB is not set 925# CONFIG_I2C_TINY_USB is not set
884 926
885# 927#
886# Graphics adapter I2C/DDC channel drivers
887#
888# CONFIG_I2C_VOODOO3 is not set
889
890#
891# Other I2C/SMBus bus drivers 928# Other I2C/SMBus bus drivers
892# 929#
893# CONFIG_I2C_PCA_PLATFORM is not set 930# CONFIG_I2C_PCA_PLATFORM is not set
@@ -896,7 +933,6 @@ CONFIG_I2C_MPC=y
896# 933#
897# Miscellaneous I2C Chip support 934# Miscellaneous I2C Chip support
898# 935#
899# CONFIG_DS1682 is not set
900# CONFIG_SENSORS_TSL2550 is not set 936# CONFIG_SENSORS_TSL2550 is not set
901# CONFIG_I2C_DEBUG_CORE is not set 937# CONFIG_I2C_DEBUG_CORE is not set
902# CONFIG_I2C_DEBUG_ALGO is not set 938# CONFIG_I2C_DEBUG_ALGO is not set
@@ -910,6 +946,8 @@ CONFIG_SPI_MASTER=y
910# 946#
911# CONFIG_SPI_BITBANG is not set 947# CONFIG_SPI_BITBANG is not set
912# CONFIG_SPI_MPC8xxx is not set 948# CONFIG_SPI_MPC8xxx is not set
949# CONFIG_SPI_XILINX is not set
950# CONFIG_SPI_DESIGNWARE is not set
913 951
914# 952#
915# SPI Protocol Masters 953# SPI Protocol Masters
@@ -957,6 +995,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
957# CONFIG_SENSORS_IT87 is not set 995# CONFIG_SENSORS_IT87 is not set
958# CONFIG_SENSORS_LM63 is not set 996# CONFIG_SENSORS_LM63 is not set
959# CONFIG_SENSORS_LM70 is not set 997# CONFIG_SENSORS_LM70 is not set
998# CONFIG_SENSORS_LM73 is not set
960CONFIG_SENSORS_LM75=y 999CONFIG_SENSORS_LM75=y
961# CONFIG_SENSORS_LM77 is not set 1000# CONFIG_SENSORS_LM77 is not set
962# CONFIG_SENSORS_LM78 is not set 1001# CONFIG_SENSORS_LM78 is not set
@@ -997,6 +1036,7 @@ CONFIG_SENSORS_W83781D=y
997# CONFIG_SENSORS_W83627HF is not set 1036# CONFIG_SENSORS_W83627HF is not set
998# CONFIG_SENSORS_W83627EHF is not set 1037# CONFIG_SENSORS_W83627EHF is not set
999# CONFIG_SENSORS_LIS3_SPI is not set 1038# CONFIG_SENSORS_LIS3_SPI is not set
1039# CONFIG_SENSORS_LIS3_I2C is not set
1000# CONFIG_THERMAL is not set 1040# CONFIG_THERMAL is not set
1001# CONFIG_WATCHDOG is not set 1041# CONFIG_WATCHDOG is not set
1002CONFIG_SSB_POSSIBLE=y 1042CONFIG_SSB_POSSIBLE=y
@@ -1015,6 +1055,7 @@ CONFIG_SSB_POSSIBLE=y
1015# CONFIG_TWL4030_CORE is not set 1055# CONFIG_TWL4030_CORE is not set
1016# CONFIG_MFD_TMIO is not set 1056# CONFIG_MFD_TMIO is not set
1017# CONFIG_PMIC_DA903X is not set 1057# CONFIG_PMIC_DA903X is not set
1058# CONFIG_PMIC_ADP5520 is not set
1018# CONFIG_MFD_WM8400 is not set 1059# CONFIG_MFD_WM8400 is not set
1019# CONFIG_MFD_WM831X is not set 1060# CONFIG_MFD_WM831X is not set
1020# CONFIG_MFD_WM8350_I2C is not set 1061# CONFIG_MFD_WM8350_I2C is not set
@@ -1022,6 +1063,8 @@ CONFIG_SSB_POSSIBLE=y
1022# CONFIG_MFD_MC13783 is not set 1063# CONFIG_MFD_MC13783 is not set
1023# CONFIG_AB3100_CORE is not set 1064# CONFIG_AB3100_CORE is not set
1024# CONFIG_EZX_PCAP is not set 1065# CONFIG_EZX_PCAP is not set
1066# CONFIG_MFD_88PM8607 is not set
1067# CONFIG_AB4500_CORE is not set
1025# CONFIG_REGULATOR is not set 1068# CONFIG_REGULATOR is not set
1026# CONFIG_MEDIA_SUPPORT is not set 1069# CONFIG_MEDIA_SUPPORT is not set
1027 1070
@@ -1192,6 +1235,7 @@ CONFIG_USB_MON=y
1192CONFIG_USB_EHCI_HCD=y 1235CONFIG_USB_EHCI_HCD=y
1193# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1236# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1194# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1237# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1238# CONFIG_XPS_USB_HCD_XILINX is not set
1195# CONFIG_USB_EHCI_FSL is not set 1239# CONFIG_USB_EHCI_FSL is not set
1196CONFIG_USB_EHCI_HCD_PPC_OF=y 1240CONFIG_USB_EHCI_HCD_PPC_OF=y
1197# CONFIG_USB_OXU210HP_HCD is not set 1241# CONFIG_USB_OXU210HP_HCD is not set
@@ -1318,6 +1362,7 @@ CONFIG_RTC_INTF_DEV=y
1318# CONFIG_RTC_DRV_PCF8563 is not set 1362# CONFIG_RTC_DRV_PCF8563 is not set
1319# CONFIG_RTC_DRV_PCF8583 is not set 1363# CONFIG_RTC_DRV_PCF8583 is not set
1320# CONFIG_RTC_DRV_M41T80 is not set 1364# CONFIG_RTC_DRV_M41T80 is not set
1365# CONFIG_RTC_DRV_BQ32K is not set
1321# CONFIG_RTC_DRV_S35390A is not set 1366# CONFIG_RTC_DRV_S35390A is not set
1322# CONFIG_RTC_DRV_FM3130 is not set 1367# CONFIG_RTC_DRV_FM3130 is not set
1323# CONFIG_RTC_DRV_RX8581 is not set 1368# CONFIG_RTC_DRV_RX8581 is not set
@@ -1347,7 +1392,9 @@ CONFIG_RTC_INTF_DEV=y
1347# CONFIG_RTC_DRV_M48T86 is not set 1392# CONFIG_RTC_DRV_M48T86 is not set
1348# CONFIG_RTC_DRV_M48T35 is not set 1393# CONFIG_RTC_DRV_M48T35 is not set
1349# CONFIG_RTC_DRV_M48T59 is not set 1394# CONFIG_RTC_DRV_M48T59 is not set
1395# CONFIG_RTC_DRV_MSM6242 is not set
1350# CONFIG_RTC_DRV_BQ4802 is not set 1396# CONFIG_RTC_DRV_BQ4802 is not set
1397# CONFIG_RTC_DRV_RP5C01 is not set
1351# CONFIG_RTC_DRV_V3020 is not set 1398# CONFIG_RTC_DRV_V3020 is not set
1352 1399
1353# 1400#
@@ -1574,7 +1621,7 @@ CONFIG_FRAME_WARN=1024
1574# CONFIG_DEBUG_KERNEL is not set 1621# CONFIG_DEBUG_KERNEL is not set
1575# CONFIG_SLUB_DEBUG_ON is not set 1622# CONFIG_SLUB_DEBUG_ON is not set
1576# CONFIG_SLUB_STATS is not set 1623# CONFIG_SLUB_STATS is not set
1577# CONFIG_DEBUG_BUGVERBOSE is not set 1624CONFIG_DEBUG_BUGVERBOSE=y
1578# CONFIG_DEBUG_MEMORY_INIT is not set 1625# CONFIG_DEBUG_MEMORY_INIT is not set
1579# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1626# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1580# CONFIG_LATENCYTOP is not set 1627# CONFIG_LATENCYTOP is not set
@@ -1600,7 +1647,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1600# CONFIG_KEYS is not set 1647# CONFIG_KEYS is not set
1601# CONFIG_SECURITY is not set 1648# CONFIG_SECURITY is not set
1602# CONFIG_SECURITYFS is not set 1649# CONFIG_SECURITYFS is not set
1603# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1650# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1651# CONFIG_DEFAULT_SECURITY_SMACK is not set
1652# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1653CONFIG_DEFAULT_SECURITY_DAC=y
1654CONFIG_DEFAULT_SECURITY=""
1604CONFIG_CRYPTO=y 1655CONFIG_CRYPTO=y
1605 1656
1606# 1657#
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig
index c8327e88a987..ce313259df14 100644
--- a/arch/powerpc/configs/85xx/stx_gp3_defconfig
+++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:38 2009 4# Wed Jan 6 09:24:32 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -178,14 +182,41 @@ CONFIG_LBDAF=y
178# IO Schedulers 182# IO Schedulers
179# 183#
180CONFIG_IOSCHED_NOOP=y 184CONFIG_IOSCHED_NOOP=y
181CONFIG_IOSCHED_AS=y
182CONFIG_IOSCHED_DEADLINE=y 185CONFIG_IOSCHED_DEADLINE=y
183CONFIG_IOSCHED_CFQ=y 186CONFIG_IOSCHED_CFQ=y
184# CONFIG_DEFAULT_AS is not set
185# CONFIG_DEFAULT_DEADLINE is not set 187# CONFIG_DEFAULT_DEADLINE is not set
186CONFIG_DEFAULT_CFQ=y 188CONFIG_DEFAULT_CFQ=y
187# CONFIG_DEFAULT_NOOP is not set 189# CONFIG_DEFAULT_NOOP is not set
188CONFIG_DEFAULT_IOSCHED="cfq" 190CONFIG_DEFAULT_IOSCHED="cfq"
191# CONFIG_INLINE_SPIN_TRYLOCK is not set
192# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
193# CONFIG_INLINE_SPIN_LOCK is not set
194# CONFIG_INLINE_SPIN_LOCK_BH is not set
195# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
196# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
197CONFIG_INLINE_SPIN_UNLOCK=y
198# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
199CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
200# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_READ_TRYLOCK is not set
202# CONFIG_INLINE_READ_LOCK is not set
203# CONFIG_INLINE_READ_LOCK_BH is not set
204# CONFIG_INLINE_READ_LOCK_IRQ is not set
205# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
206CONFIG_INLINE_READ_UNLOCK=y
207# CONFIG_INLINE_READ_UNLOCK_BH is not set
208CONFIG_INLINE_READ_UNLOCK_IRQ=y
209# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
210# CONFIG_INLINE_WRITE_TRYLOCK is not set
211# CONFIG_INLINE_WRITE_LOCK is not set
212# CONFIG_INLINE_WRITE_LOCK_BH is not set
213# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
214# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
215CONFIG_INLINE_WRITE_UNLOCK=y
216# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
217CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
218# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
219# CONFIG_MUTEX_SPIN_ON_OWNER is not set
189# CONFIG_FREEZER is not set 220# CONFIG_FREEZER is not set
190 221
191# 222#
@@ -194,7 +225,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_PPC_CELL is not set 225# CONFIG_PPC_CELL is not set
195# CONFIG_PPC_CELL_NATIVE is not set 226# CONFIG_PPC_CELL_NATIVE is not set
196# CONFIG_PQ2ADS is not set 227# CONFIG_PQ2ADS is not set
197CONFIG_MPC85xx=y 228CONFIG_FSL_SOC_BOOKE=y
198# CONFIG_MPC8540_ADS is not set 229# CONFIG_MPC8540_ADS is not set
199# CONFIG_MPC8560_ADS is not set 230# CONFIG_MPC8560_ADS is not set
200# CONFIG_MPC85xx_CDS is not set 231# CONFIG_MPC85xx_CDS is not set
@@ -213,6 +244,7 @@ CONFIG_STX_GP3=y
213# CONFIG_TQM8560 is not set 244# CONFIG_TQM8560 is not set
214# CONFIG_SBC8548 is not set 245# CONFIG_SBC8548 is not set
215# CONFIG_SBC8560 is not set 246# CONFIG_SBC8560 is not set
247# CONFIG_P4080_DS is not set
216# CONFIG_IPIC is not set 248# CONFIG_IPIC is not set
217CONFIG_MPIC=y 249CONFIG_MPIC=y
218# CONFIG_MPIC_WEIRD is not set 250# CONFIG_MPIC_WEIRD is not set
@@ -257,6 +289,7 @@ CONFIG_MATH_EMULATION=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
258CONFIG_ARCH_HAS_WALK_MEMORY=y 290CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 291CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
292CONFIG_SPARSE_IRQ=y
260CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
261CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
262CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -273,8 +306,6 @@ CONFIG_MIGRATION=y
273CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
274CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
275CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
276CONFIG_HAVE_MLOCK=y
277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set 309# CONFIG_KSM is not set
279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
280CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -463,9 +494,6 @@ CONFIG_NET_PKTGEN=y
463# CONFIG_AF_RXRPC is not set 494# CONFIG_AF_RXRPC is not set
464CONFIG_WIRELESS=y 495CONFIG_WIRELESS=y
465# CONFIG_CFG80211 is not set 496# CONFIG_CFG80211 is not set
466CONFIG_CFG80211_DEFAULT_PS_VALUE=0
467CONFIG_WIRELESS_OLD_REGULATORY=y
468# CONFIG_WIRELESS_EXT is not set
469# CONFIG_LIB80211 is not set 497# CONFIG_LIB80211 is not set
470 498
471# 499#
@@ -513,6 +541,10 @@ CONFIG_BLK_DEV=y
513# CONFIG_BLK_DEV_COW_COMMON is not set 541# CONFIG_BLK_DEV_COW_COMMON is not set
514CONFIG_BLK_DEV_LOOP=m 542CONFIG_BLK_DEV_LOOP=m
515# CONFIG_BLK_DEV_CRYPTOLOOP is not set 543# CONFIG_BLK_DEV_CRYPTOLOOP is not set
544
545#
546# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
547#
516CONFIG_BLK_DEV_NBD=m 548CONFIG_BLK_DEV_NBD=m
517# CONFIG_BLK_DEV_SX8 is not set 549# CONFIG_BLK_DEV_SX8 is not set
518CONFIG_BLK_DEV_RAM=y 550CONFIG_BLK_DEV_RAM=y
@@ -523,6 +555,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
523# CONFIG_ATA_OVER_ETH is not set 555# CONFIG_ATA_OVER_ETH is not set
524# CONFIG_BLK_DEV_HD is not set 556# CONFIG_BLK_DEV_HD is not set
525CONFIG_MISC_DEVICES=y 557CONFIG_MISC_DEVICES=y
558# CONFIG_AD525X_DPOT is not set
526# CONFIG_PHANTOM is not set 559# CONFIG_PHANTOM is not set
527# CONFIG_SGI_IOC4 is not set 560# CONFIG_SGI_IOC4 is not set
528# CONFIG_TIFM_CORE is not set 561# CONFIG_TIFM_CORE is not set
@@ -530,6 +563,7 @@ CONFIG_MISC_DEVICES=y
530# CONFIG_ENCLOSURE_SERVICES is not set 563# CONFIG_ENCLOSURE_SERVICES is not set
531# CONFIG_HP_ILO is not set 564# CONFIG_HP_ILO is not set
532# CONFIG_ISL29003 is not set 565# CONFIG_ISL29003 is not set
566# CONFIG_DS1682 is not set
533# CONFIG_C2PORT is not set 567# CONFIG_C2PORT is not set
534 568
535# 569#
@@ -633,7 +667,9 @@ CONFIG_SCSI_LOWLEVEL=y
633# CONFIG_SCSI_BNX2_ISCSI is not set 667# CONFIG_SCSI_BNX2_ISCSI is not set
634# CONFIG_BE2ISCSI is not set 668# CONFIG_BE2ISCSI is not set
635# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 669# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
670# CONFIG_SCSI_HPSA is not set
636# CONFIG_SCSI_3W_9XXX is not set 671# CONFIG_SCSI_3W_9XXX is not set
672# CONFIG_SCSI_3W_SAS is not set
637# CONFIG_SCSI_ACARD is not set 673# CONFIG_SCSI_ACARD is not set
638# CONFIG_SCSI_AACRAID is not set 674# CONFIG_SCSI_AACRAID is not set
639# CONFIG_SCSI_AIC7XXX is not set 675# CONFIG_SCSI_AIC7XXX is not set
@@ -673,6 +709,7 @@ CONFIG_SCSI_LOWLEVEL=y
673# CONFIG_SCSI_NSP32 is not set 709# CONFIG_SCSI_NSP32 is not set
674# CONFIG_SCSI_DEBUG is not set 710# CONFIG_SCSI_DEBUG is not set
675# CONFIG_SCSI_PMCRAID is not set 711# CONFIG_SCSI_PMCRAID is not set
712# CONFIG_SCSI_PM8001 is not set
676# CONFIG_SCSI_SRP is not set 713# CONFIG_SCSI_SRP is not set
677# CONFIG_SCSI_BFA_FC is not set 714# CONFIG_SCSI_BFA_FC is not set
678# CONFIG_SCSI_DH is not set 715# CONFIG_SCSI_DH is not set
@@ -690,7 +727,7 @@ CONFIG_SCSI_LOWLEVEL=y
690# 727#
691 728
692# 729#
693# See the help texts for more information. 730# The newer stack is recommended.
694# 731#
695# CONFIG_FIREWIRE is not set 732# CONFIG_FIREWIRE is not set
696# CONFIG_IEEE1394 is not set 733# CONFIG_IEEE1394 is not set
@@ -797,8 +834,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
797# CONFIG_BE2NET is not set 834# CONFIG_BE2NET is not set
798# CONFIG_TR is not set 835# CONFIG_TR is not set
799CONFIG_WLAN=y 836CONFIG_WLAN=y
800# CONFIG_WLAN_PRE80211 is not set 837# CONFIG_AIRO is not set
801# CONFIG_WLAN_80211 is not set 838# CONFIG_ATMEL is not set
839# CONFIG_PRISM54 is not set
840# CONFIG_HOSTAP is not set
802 841
803# 842#
804# Enable WiMAX (Networking options) to see the WiMAX drivers 843# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -813,6 +852,7 @@ CONFIG_WLAN=y
813# CONFIG_NETCONSOLE is not set 852# CONFIG_NETCONSOLE is not set
814# CONFIG_NETPOLL is not set 853# CONFIG_NETPOLL is not set
815# CONFIG_NET_POLL_CONTROLLER is not set 854# CONFIG_NET_POLL_CONTROLLER is not set
855# CONFIG_VMXNET3 is not set
816# CONFIG_ISDN is not set 856# CONFIG_ISDN is not set
817# CONFIG_PHONE is not set 857# CONFIG_PHONE is not set
818 858
@@ -822,6 +862,7 @@ CONFIG_WLAN=y
822CONFIG_INPUT=y 862CONFIG_INPUT=y
823# CONFIG_INPUT_FF_MEMLESS is not set 863# CONFIG_INPUT_FF_MEMLESS is not set
824# CONFIG_INPUT_POLLDEV is not set 864# CONFIG_INPUT_POLLDEV is not set
865# CONFIG_INPUT_SPARSEKMAP is not set
825 866
826# 867#
827# Userland interfaces 868# Userland interfaces
@@ -881,6 +922,7 @@ CONFIG_SERIO_SERPORT=y
881CONFIG_SERIO_LIBPS2=y 922CONFIG_SERIO_LIBPS2=y
882# CONFIG_SERIO_RAW is not set 923# CONFIG_SERIO_RAW is not set
883# CONFIG_SERIO_XILINX_XPS_PS2 is not set 924# CONFIG_SERIO_XILINX_XPS_PS2 is not set
925# CONFIG_SERIO_ALTERA_PS2 is not set
884# CONFIG_GAMEPORT is not set 926# CONFIG_GAMEPORT is not set
885 927
886# 928#
@@ -905,6 +947,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
905CONFIG_SERIAL_CPM=y 947CONFIG_SERIAL_CPM=y
906CONFIG_SERIAL_CPM_CONSOLE=y 948CONFIG_SERIAL_CPM_CONSOLE=y
907# CONFIG_SERIAL_JSM is not set 949# CONFIG_SERIAL_JSM is not set
950# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
908CONFIG_UNIX98_PTYS=y 951CONFIG_UNIX98_PTYS=y
909# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 952# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
910CONFIG_LEGACY_PTYS=y 953CONFIG_LEGACY_PTYS=y
@@ -970,11 +1013,6 @@ CONFIG_I2C_ALGOBIT=m
970# CONFIG_I2C_TAOS_EVM is not set 1013# CONFIG_I2C_TAOS_EVM is not set
971 1014
972# 1015#
973# Graphics adapter I2C/DDC channel drivers
974#
975# CONFIG_I2C_VOODOO3 is not set
976
977#
978# Other I2C/SMBus bus drivers 1016# Other I2C/SMBus bus drivers
979# 1017#
980# CONFIG_I2C_PCA_PLATFORM is not set 1018# CONFIG_I2C_PCA_PLATFORM is not set
@@ -983,7 +1021,6 @@ CONFIG_I2C_ALGOBIT=m
983# 1021#
984# Miscellaneous I2C Chip support 1022# Miscellaneous I2C Chip support
985# 1023#
986# CONFIG_DS1682 is not set
987# CONFIG_SENSORS_TSL2550 is not set 1024# CONFIG_SENSORS_TSL2550 is not set
988# CONFIG_I2C_DEBUG_CORE is not set 1025# CONFIG_I2C_DEBUG_CORE is not set
989# CONFIG_I2C_DEBUG_ALGO is not set 1026# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1016,6 +1053,7 @@ CONFIG_GPIOLIB=y
1016# 1053#
1017# PCI GPIO expanders: 1054# PCI GPIO expanders:
1018# 1055#
1056# CONFIG_GPIO_CS5535 is not set
1019# CONFIG_GPIO_BT8XX is not set 1057# CONFIG_GPIO_BT8XX is not set
1020# CONFIG_GPIO_LANGWELL is not set 1058# CONFIG_GPIO_LANGWELL is not set
1021 1059
@@ -1058,6 +1096,7 @@ CONFIG_HWMON=y
1058# CONFIG_SENSORS_GL520SM is not set 1096# CONFIG_SENSORS_GL520SM is not set
1059# CONFIG_SENSORS_IT87 is not set 1097# CONFIG_SENSORS_IT87 is not set
1060# CONFIG_SENSORS_LM63 is not set 1098# CONFIG_SENSORS_LM63 is not set
1099# CONFIG_SENSORS_LM73 is not set
1061# CONFIG_SENSORS_LM75 is not set 1100# CONFIG_SENSORS_LM75 is not set
1062# CONFIG_SENSORS_LM77 is not set 1101# CONFIG_SENSORS_LM77 is not set
1063# CONFIG_SENSORS_LM78 is not set 1102# CONFIG_SENSORS_LM78 is not set
@@ -1097,6 +1136,7 @@ CONFIG_HWMON=y
1097# CONFIG_SENSORS_W83L786NG is not set 1136# CONFIG_SENSORS_W83L786NG is not set
1098# CONFIG_SENSORS_W83627HF is not set 1137# CONFIG_SENSORS_W83627HF is not set
1099# CONFIG_SENSORS_W83627EHF is not set 1138# CONFIG_SENSORS_W83627EHF is not set
1139# CONFIG_SENSORS_LIS3_I2C is not set
1100# CONFIG_THERMAL is not set 1140# CONFIG_THERMAL is not set
1101# CONFIG_WATCHDOG is not set 1141# CONFIG_WATCHDOG is not set
1102CONFIG_SSB_POSSIBLE=y 1142CONFIG_SSB_POSSIBLE=y
@@ -1115,7 +1155,6 @@ CONFIG_SSB_POSSIBLE=y
1115# CONFIG_TPS65010 is not set 1155# CONFIG_TPS65010 is not set
1116# CONFIG_MFD_TMIO is not set 1156# CONFIG_MFD_TMIO is not set
1117# CONFIG_MFD_WM8400 is not set 1157# CONFIG_MFD_WM8400 is not set
1118# CONFIG_MFD_WM831X is not set
1119# CONFIG_MFD_WM8350_I2C is not set 1158# CONFIG_MFD_WM8350_I2C is not set
1120# CONFIG_MFD_PCF50633 is not set 1159# CONFIG_MFD_PCF50633 is not set
1121# CONFIG_AB3100_CORE is not set 1160# CONFIG_AB3100_CORE is not set
@@ -1465,7 +1504,11 @@ CONFIG_BDI_SWITCH=y
1465# CONFIG_KEYS is not set 1504# CONFIG_KEYS is not set
1466# CONFIG_SECURITY is not set 1505# CONFIG_SECURITY is not set
1467# CONFIG_SECURITYFS is not set 1506# CONFIG_SECURITYFS is not set
1468# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1507# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1508# CONFIG_DEFAULT_SECURITY_SMACK is not set
1509# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1510CONFIG_DEFAULT_SECURITY_DAC=y
1511CONFIG_DEFAULT_SECURITY=""
1469CONFIG_CRYPTO=y 1512CONFIG_CRYPTO=y
1470 1513
1471# 1514#
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig
index 82563703d5e3..0824b4667229 100644
--- a/arch/powerpc/configs/85xx/tqm8540_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8540_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:39 2009 4# Wed Jan 6 09:24:33 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -169,14 +173,41 @@ CONFIG_LBDAF=y
169# IO Schedulers 173# IO Schedulers
170# 174#
171CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
172CONFIG_IOSCHED_AS=y
173CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
174CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
175CONFIG_DEFAULT_AS=y
176# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
177# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
178# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
179CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
180# CONFIG_FREEZER is not set 211# CONFIG_FREEZER is not set
181 212
182# 213#
@@ -185,7 +216,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
185# CONFIG_PPC_CELL is not set 216# CONFIG_PPC_CELL is not set
186# CONFIG_PPC_CELL_NATIVE is not set 217# CONFIG_PPC_CELL_NATIVE is not set
187# CONFIG_PQ2ADS is not set 218# CONFIG_PQ2ADS is not set
188CONFIG_MPC85xx=y 219CONFIG_FSL_SOC_BOOKE=y
189# CONFIG_MPC8540_ADS is not set 220# CONFIG_MPC8540_ADS is not set
190# CONFIG_MPC8560_ADS is not set 221# CONFIG_MPC8560_ADS is not set
191# CONFIG_MPC85xx_CDS is not set 222# CONFIG_MPC85xx_CDS is not set
@@ -204,6 +235,7 @@ CONFIG_TQM8540=y
204# CONFIG_TQM8560 is not set 235# CONFIG_TQM8560 is not set
205# CONFIG_SBC8548 is not set 236# CONFIG_SBC8548 is not set
206# CONFIG_SBC8560 is not set 237# CONFIG_SBC8560 is not set
238# CONFIG_P4080_DS is not set
207CONFIG_TQM85xx=y 239CONFIG_TQM85xx=y
208# CONFIG_IPIC is not set 240# CONFIG_IPIC is not set
209CONFIG_MPIC=y 241CONFIG_MPIC=y
@@ -248,6 +280,7 @@ CONFIG_MATH_EMULATION=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
249CONFIG_ARCH_HAS_WALK_MEMORY=y 281CONFIG_ARCH_HAS_WALK_MEMORY=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 282CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
283CONFIG_SPARSE_IRQ=y
251CONFIG_MAX_ACTIVE_REGIONS=32 284CONFIG_MAX_ACTIVE_REGIONS=32
252CONFIG_ARCH_FLATMEM_ENABLE=y 285CONFIG_ARCH_FLATMEM_ENABLE=y
253CONFIG_ARCH_POPULATES_NODE_MAP=y 286CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -264,8 +297,6 @@ CONFIG_MIGRATION=y
264CONFIG_ZONE_DMA_FLAG=1 297CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 298CONFIG_BOUNCE=y
266CONFIG_VIRT_TO_BUS=y 299CONFIG_VIRT_TO_BUS=y
267CONFIG_HAVE_MLOCK=y
268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set 300# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 301CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271CONFIG_PPC_4K_PAGES=y 302CONFIG_PPC_4K_PAGES=y
@@ -391,9 +422,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
391# CONFIG_AF_RXRPC is not set 422# CONFIG_AF_RXRPC is not set
392CONFIG_WIRELESS=y 423CONFIG_WIRELESS=y
393# CONFIG_CFG80211 is not set 424# CONFIG_CFG80211 is not set
394CONFIG_CFG80211_DEFAULT_PS_VALUE=0
395CONFIG_WIRELESS_OLD_REGULATORY=y
396# CONFIG_WIRELESS_EXT is not set
397# CONFIG_LIB80211 is not set 425# CONFIG_LIB80211 is not set
398 426
399# 427#
@@ -510,6 +538,10 @@ CONFIG_BLK_DEV=y
510# CONFIG_BLK_DEV_COW_COMMON is not set 538# CONFIG_BLK_DEV_COW_COMMON is not set
511CONFIG_BLK_DEV_LOOP=y 539CONFIG_BLK_DEV_LOOP=y
512# CONFIG_BLK_DEV_CRYPTOLOOP is not set 540# CONFIG_BLK_DEV_CRYPTOLOOP is not set
541
542#
543# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
544#
513# CONFIG_BLK_DEV_NBD is not set 545# CONFIG_BLK_DEV_NBD is not set
514# CONFIG_BLK_DEV_SX8 is not set 546# CONFIG_BLK_DEV_SX8 is not set
515CONFIG_BLK_DEV_RAM=y 547CONFIG_BLK_DEV_RAM=y
@@ -520,6 +552,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
520# CONFIG_ATA_OVER_ETH is not set 552# CONFIG_ATA_OVER_ETH is not set
521# CONFIG_BLK_DEV_HD is not set 553# CONFIG_BLK_DEV_HD is not set
522CONFIG_MISC_DEVICES=y 554CONFIG_MISC_DEVICES=y
555# CONFIG_AD525X_DPOT is not set
523# CONFIG_PHANTOM is not set 556# CONFIG_PHANTOM is not set
524# CONFIG_SGI_IOC4 is not set 557# CONFIG_SGI_IOC4 is not set
525# CONFIG_TIFM_CORE is not set 558# CONFIG_TIFM_CORE is not set
@@ -527,6 +560,7 @@ CONFIG_MISC_DEVICES=y
527# CONFIG_ENCLOSURE_SERVICES is not set 560# CONFIG_ENCLOSURE_SERVICES is not set
528# CONFIG_HP_ILO is not set 561# CONFIG_HP_ILO is not set
529# CONFIG_ISL29003 is not set 562# CONFIG_ISL29003 is not set
563# CONFIG_DS1682 is not set
530# CONFIG_C2PORT is not set 564# CONFIG_C2PORT is not set
531 565
532# 566#
@@ -615,7 +649,7 @@ CONFIG_BLK_DEV_IDEDMA=y
615# 649#
616 650
617# 651#
618# See the help texts for more information. 652# The newer stack is recommended.
619# 653#
620# CONFIG_FIREWIRE is not set 654# CONFIG_FIREWIRE is not set
621# CONFIG_IEEE1394 is not set 655# CONFIG_IEEE1394 is not set
@@ -738,8 +772,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
738# CONFIG_BE2NET is not set 772# CONFIG_BE2NET is not set
739# CONFIG_TR is not set 773# CONFIG_TR is not set
740CONFIG_WLAN=y 774CONFIG_WLAN=y
741# CONFIG_WLAN_PRE80211 is not set 775# CONFIG_AIRO is not set
742# CONFIG_WLAN_80211 is not set 776# CONFIG_ATMEL is not set
777# CONFIG_PRISM54 is not set
778# CONFIG_HOSTAP is not set
743 779
744# 780#
745# Enable WiMAX (Networking options) to see the WiMAX drivers 781# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -752,6 +788,7 @@ CONFIG_WLAN=y
752# CONFIG_NETCONSOLE is not set 788# CONFIG_NETCONSOLE is not set
753# CONFIG_NETPOLL is not set 789# CONFIG_NETPOLL is not set
754# CONFIG_NET_POLL_CONTROLLER is not set 790# CONFIG_NET_POLL_CONTROLLER is not set
791# CONFIG_VMXNET3 is not set
755# CONFIG_ISDN is not set 792# CONFIG_ISDN is not set
756# CONFIG_PHONE is not set 793# CONFIG_PHONE is not set
757 794
@@ -761,6 +798,7 @@ CONFIG_WLAN=y
761CONFIG_INPUT=y 798CONFIG_INPUT=y
762# CONFIG_INPUT_FF_MEMLESS is not set 799# CONFIG_INPUT_FF_MEMLESS is not set
763# CONFIG_INPUT_POLLDEV is not set 800# CONFIG_INPUT_POLLDEV is not set
801# CONFIG_INPUT_SPARSEKMAP is not set
764 802
765# 803#
766# Userland interfaces 804# Userland interfaces
@@ -813,6 +851,7 @@ CONFIG_SERIAL_CORE=y
813CONFIG_SERIAL_CORE_CONSOLE=y 851CONFIG_SERIAL_CORE_CONSOLE=y
814# CONFIG_SERIAL_JSM is not set 852# CONFIG_SERIAL_JSM is not set
815# CONFIG_SERIAL_OF_PLATFORM is not set 853# CONFIG_SERIAL_OF_PLATFORM is not set
854# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
816CONFIG_UNIX98_PTYS=y 855CONFIG_UNIX98_PTYS=y
817# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 856# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
818CONFIG_LEGACY_PTYS=y 857CONFIG_LEGACY_PTYS=y
@@ -871,11 +910,6 @@ CONFIG_I2C_MPC=y
871# CONFIG_I2C_TAOS_EVM is not set 910# CONFIG_I2C_TAOS_EVM is not set
872 911
873# 912#
874# Graphics adapter I2C/DDC channel drivers
875#
876# CONFIG_I2C_VOODOO3 is not set
877
878#
879# Other I2C/SMBus bus drivers 913# Other I2C/SMBus bus drivers
880# 914#
881# CONFIG_I2C_PCA_PLATFORM is not set 915# CONFIG_I2C_PCA_PLATFORM is not set
@@ -883,7 +917,6 @@ CONFIG_I2C_MPC=y
883# 917#
884# Miscellaneous I2C Chip support 918# Miscellaneous I2C Chip support
885# 919#
886# CONFIG_DS1682 is not set
887# CONFIG_SENSORS_TSL2550 is not set 920# CONFIG_SENSORS_TSL2550 is not set
888# CONFIG_I2C_DEBUG_CORE is not set 921# CONFIG_I2C_DEBUG_CORE is not set
889# CONFIG_I2C_DEBUG_ALGO is not set 922# CONFIG_I2C_DEBUG_ALGO is not set
@@ -929,6 +962,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
929# CONFIG_SENSORS_GL520SM is not set 962# CONFIG_SENSORS_GL520SM is not set
930# CONFIG_SENSORS_IT87 is not set 963# CONFIG_SENSORS_IT87 is not set
931# CONFIG_SENSORS_LM63 is not set 964# CONFIG_SENSORS_LM63 is not set
965# CONFIG_SENSORS_LM73 is not set
932CONFIG_SENSORS_LM75=y 966CONFIG_SENSORS_LM75=y
933# CONFIG_SENSORS_LM77 is not set 967# CONFIG_SENSORS_LM77 is not set
934# CONFIG_SENSORS_LM78 is not set 968# CONFIG_SENSORS_LM78 is not set
@@ -967,6 +1001,7 @@ CONFIG_SENSORS_LM75=y
967# CONFIG_SENSORS_W83L786NG is not set 1001# CONFIG_SENSORS_W83L786NG is not set
968# CONFIG_SENSORS_W83627HF is not set 1002# CONFIG_SENSORS_W83627HF is not set
969# CONFIG_SENSORS_W83627EHF is not set 1003# CONFIG_SENSORS_W83627EHF is not set
1004# CONFIG_SENSORS_LIS3_I2C is not set
970# CONFIG_THERMAL is not set 1005# CONFIG_THERMAL is not set
971# CONFIG_WATCHDOG is not set 1006# CONFIG_WATCHDOG is not set
972CONFIG_SSB_POSSIBLE=y 1007CONFIG_SSB_POSSIBLE=y
@@ -985,11 +1020,13 @@ CONFIG_SSB_POSSIBLE=y
985# CONFIG_TWL4030_CORE is not set 1020# CONFIG_TWL4030_CORE is not set
986# CONFIG_MFD_TMIO is not set 1021# CONFIG_MFD_TMIO is not set
987# CONFIG_PMIC_DA903X is not set 1022# CONFIG_PMIC_DA903X is not set
1023# CONFIG_PMIC_ADP5520 is not set
988# CONFIG_MFD_WM8400 is not set 1024# CONFIG_MFD_WM8400 is not set
989# CONFIG_MFD_WM831X is not set 1025# CONFIG_MFD_WM831X is not set
990# CONFIG_MFD_WM8350_I2C is not set 1026# CONFIG_MFD_WM8350_I2C is not set
991# CONFIG_MFD_PCF50633 is not set 1027# CONFIG_MFD_PCF50633 is not set
992# CONFIG_AB3100_CORE is not set 1028# CONFIG_AB3100_CORE is not set
1029# CONFIG_MFD_88PM8607 is not set
993# CONFIG_REGULATOR is not set 1030# CONFIG_REGULATOR is not set
994# CONFIG_MEDIA_SUPPORT is not set 1031# CONFIG_MEDIA_SUPPORT is not set
995 1032
@@ -1220,7 +1257,7 @@ CONFIG_FRAME_WARN=1024
1220# CONFIG_DEBUG_KERNEL is not set 1257# CONFIG_DEBUG_KERNEL is not set
1221# CONFIG_SLUB_DEBUG_ON is not set 1258# CONFIG_SLUB_DEBUG_ON is not set
1222# CONFIG_SLUB_STATS is not set 1259# CONFIG_SLUB_STATS is not set
1223# CONFIG_DEBUG_BUGVERBOSE is not set 1260CONFIG_DEBUG_BUGVERBOSE=y
1224# CONFIG_DEBUG_MEMORY_INIT is not set 1261# CONFIG_DEBUG_MEMORY_INIT is not set
1225# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1262# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1226# CONFIG_LATENCYTOP is not set 1263# CONFIG_LATENCYTOP is not set
@@ -1246,7 +1283,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1246# CONFIG_KEYS is not set 1283# CONFIG_KEYS is not set
1247# CONFIG_SECURITY is not set 1284# CONFIG_SECURITY is not set
1248# CONFIG_SECURITYFS is not set 1285# CONFIG_SECURITYFS is not set
1249# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1286# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1287# CONFIG_DEFAULT_SECURITY_SMACK is not set
1288# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1289CONFIG_DEFAULT_SECURITY_DAC=y
1290CONFIG_DEFAULT_SECURITY=""
1250CONFIG_CRYPTO=y 1291CONFIG_CRYPTO=y
1251 1292
1252# 1293#
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig
index 91d85d733827..2137be4100ed 100644
--- a/arch/powerpc/configs/85xx/tqm8541_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8541_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:40 2009 4# Wed Jan 6 09:24:34 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +175,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 175# IO Schedulers
172# 176#
173CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
183 214
184# 215#
@@ -187,7 +218,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
187# CONFIG_PPC_CELL is not set 218# CONFIG_PPC_CELL is not set
188# CONFIG_PPC_CELL_NATIVE is not set 219# CONFIG_PPC_CELL_NATIVE is not set
189# CONFIG_PQ2ADS is not set 220# CONFIG_PQ2ADS is not set
190CONFIG_MPC85xx=y 221CONFIG_FSL_SOC_BOOKE=y
191# CONFIG_MPC8540_ADS is not set 222# CONFIG_MPC8540_ADS is not set
192# CONFIG_MPC8560_ADS is not set 223# CONFIG_MPC8560_ADS is not set
193# CONFIG_MPC85xx_CDS is not set 224# CONFIG_MPC85xx_CDS is not set
@@ -206,6 +237,7 @@ CONFIG_TQM8541=y
206# CONFIG_TQM8560 is not set 237# CONFIG_TQM8560 is not set
207# CONFIG_SBC8548 is not set 238# CONFIG_SBC8548 is not set
208# CONFIG_SBC8560 is not set 239# CONFIG_SBC8560 is not set
240# CONFIG_P4080_DS is not set
209CONFIG_TQM85xx=y 241CONFIG_TQM85xx=y
210# CONFIG_IPIC is not set 242# CONFIG_IPIC is not set
211CONFIG_MPIC=y 243CONFIG_MPIC=y
@@ -251,6 +283,7 @@ CONFIG_MATH_EMULATION=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
252CONFIG_ARCH_HAS_WALK_MEMORY=y 284CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
286CONFIG_SPARSE_IRQ=y
254CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -267,8 +300,6 @@ CONFIG_MIGRATION=y
267CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
268CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set 303# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
274CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -394,9 +425,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_AF_RXRPC is not set 425# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
401 429
402# 430#
@@ -514,6 +542,10 @@ CONFIG_BLK_DEV=y
514# CONFIG_BLK_DEV_COW_COMMON is not set 542# CONFIG_BLK_DEV_COW_COMMON is not set
515CONFIG_BLK_DEV_LOOP=y 543CONFIG_BLK_DEV_LOOP=y
516# CONFIG_BLK_DEV_CRYPTOLOOP is not set 544# CONFIG_BLK_DEV_CRYPTOLOOP is not set
545
546#
547# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
548#
517# CONFIG_BLK_DEV_NBD is not set 549# CONFIG_BLK_DEV_NBD is not set
518# CONFIG_BLK_DEV_SX8 is not set 550# CONFIG_BLK_DEV_SX8 is not set
519CONFIG_BLK_DEV_RAM=y 551CONFIG_BLK_DEV_RAM=y
@@ -524,6 +556,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
524# CONFIG_ATA_OVER_ETH is not set 556# CONFIG_ATA_OVER_ETH is not set
525# CONFIG_BLK_DEV_HD is not set 557# CONFIG_BLK_DEV_HD is not set
526CONFIG_MISC_DEVICES=y 558CONFIG_MISC_DEVICES=y
559# CONFIG_AD525X_DPOT is not set
527# CONFIG_PHANTOM is not set 560# CONFIG_PHANTOM is not set
528# CONFIG_SGI_IOC4 is not set 561# CONFIG_SGI_IOC4 is not set
529# CONFIG_TIFM_CORE is not set 562# CONFIG_TIFM_CORE is not set
@@ -531,6 +564,7 @@ CONFIG_MISC_DEVICES=y
531# CONFIG_ENCLOSURE_SERVICES is not set 564# CONFIG_ENCLOSURE_SERVICES is not set
532# CONFIG_HP_ILO is not set 565# CONFIG_HP_ILO is not set
533# CONFIG_ISL29003 is not set 566# CONFIG_ISL29003 is not set
567# CONFIG_DS1682 is not set
534# CONFIG_C2PORT is not set 568# CONFIG_C2PORT is not set
535 569
536# 570#
@@ -619,7 +653,7 @@ CONFIG_BLK_DEV_IDEDMA=y
619# 653#
620 654
621# 655#
622# See the help texts for more information. 656# The newer stack is recommended.
623# 657#
624# CONFIG_FIREWIRE is not set 658# CONFIG_FIREWIRE is not set
625# CONFIG_IEEE1394 is not set 659# CONFIG_IEEE1394 is not set
@@ -743,8 +777,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
743# CONFIG_BE2NET is not set 777# CONFIG_BE2NET is not set
744# CONFIG_TR is not set 778# CONFIG_TR is not set
745CONFIG_WLAN=y 779CONFIG_WLAN=y
746# CONFIG_WLAN_PRE80211 is not set 780# CONFIG_AIRO is not set
747# CONFIG_WLAN_80211 is not set 781# CONFIG_ATMEL is not set
782# CONFIG_PRISM54 is not set
783# CONFIG_HOSTAP is not set
748 784
749# 785#
750# Enable WiMAX (Networking options) to see the WiMAX drivers 786# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -757,6 +793,7 @@ CONFIG_WLAN=y
757# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
758# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
759# CONFIG_NET_POLL_CONTROLLER is not set 795# CONFIG_NET_POLL_CONTROLLER is not set
796# CONFIG_VMXNET3 is not set
760# CONFIG_ISDN is not set 797# CONFIG_ISDN is not set
761# CONFIG_PHONE is not set 798# CONFIG_PHONE is not set
762 799
@@ -766,6 +803,7 @@ CONFIG_WLAN=y
766CONFIG_INPUT=y 803CONFIG_INPUT=y
767# CONFIG_INPUT_FF_MEMLESS is not set 804# CONFIG_INPUT_FF_MEMLESS is not set
768# CONFIG_INPUT_POLLDEV is not set 805# CONFIG_INPUT_POLLDEV is not set
806# CONFIG_INPUT_SPARSEKMAP is not set
769 807
770# 808#
771# Userland interfaces 809# Userland interfaces
@@ -820,6 +858,7 @@ CONFIG_SERIAL_CPM=y
820CONFIG_SERIAL_CPM_CONSOLE=y 858CONFIG_SERIAL_CPM_CONSOLE=y
821# CONFIG_SERIAL_JSM is not set 859# CONFIG_SERIAL_JSM is not set
822# CONFIG_SERIAL_OF_PLATFORM is not set 860# CONFIG_SERIAL_OF_PLATFORM is not set
861# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
823CONFIG_UNIX98_PTYS=y 862CONFIG_UNIX98_PTYS=y
824# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 863# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
825CONFIG_LEGACY_PTYS=y 864CONFIG_LEGACY_PTYS=y
@@ -881,11 +920,6 @@ CONFIG_I2C_MPC=y
881# CONFIG_I2C_TAOS_EVM is not set 920# CONFIG_I2C_TAOS_EVM is not set
882 921
883# 922#
884# Graphics adapter I2C/DDC channel drivers
885#
886# CONFIG_I2C_VOODOO3 is not set
887
888#
889# Other I2C/SMBus bus drivers 923# Other I2C/SMBus bus drivers
890# 924#
891# CONFIG_I2C_PCA_PLATFORM is not set 925# CONFIG_I2C_PCA_PLATFORM is not set
@@ -893,7 +927,6 @@ CONFIG_I2C_MPC=y
893# 927#
894# Miscellaneous I2C Chip support 928# Miscellaneous I2C Chip support
895# 929#
896# CONFIG_DS1682 is not set
897# CONFIG_SENSORS_TSL2550 is not set 930# CONFIG_SENSORS_TSL2550 is not set
898# CONFIG_I2C_DEBUG_CORE is not set 931# CONFIG_I2C_DEBUG_CORE is not set
899# CONFIG_I2C_DEBUG_ALGO is not set 932# CONFIG_I2C_DEBUG_ALGO is not set
@@ -925,6 +958,7 @@ CONFIG_GPIOLIB=y
925# 958#
926# PCI GPIO expanders: 959# PCI GPIO expanders:
927# 960#
961# CONFIG_GPIO_CS5535 is not set
928# CONFIG_GPIO_BT8XX is not set 962# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set 963# CONFIG_GPIO_LANGWELL is not set
930 964
@@ -967,6 +1001,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
967# CONFIG_SENSORS_GL520SM is not set 1001# CONFIG_SENSORS_GL520SM is not set
968# CONFIG_SENSORS_IT87 is not set 1002# CONFIG_SENSORS_IT87 is not set
969# CONFIG_SENSORS_LM63 is not set 1003# CONFIG_SENSORS_LM63 is not set
1004# CONFIG_SENSORS_LM73 is not set
970CONFIG_SENSORS_LM75=y 1005CONFIG_SENSORS_LM75=y
971# CONFIG_SENSORS_LM77 is not set 1006# CONFIG_SENSORS_LM77 is not set
972# CONFIG_SENSORS_LM78 is not set 1007# CONFIG_SENSORS_LM78 is not set
@@ -1006,6 +1041,7 @@ CONFIG_SENSORS_LM75=y
1006# CONFIG_SENSORS_W83L786NG is not set 1041# CONFIG_SENSORS_W83L786NG is not set
1007# CONFIG_SENSORS_W83627HF is not set 1042# CONFIG_SENSORS_W83627HF is not set
1008# CONFIG_SENSORS_W83627EHF is not set 1043# CONFIG_SENSORS_W83627EHF is not set
1044# CONFIG_SENSORS_LIS3_I2C is not set
1009# CONFIG_THERMAL is not set 1045# CONFIG_THERMAL is not set
1010# CONFIG_WATCHDOG is not set 1046# CONFIG_WATCHDOG is not set
1011CONFIG_SSB_POSSIBLE=y 1047CONFIG_SSB_POSSIBLE=y
@@ -1025,11 +1061,13 @@ CONFIG_SSB_POSSIBLE=y
1025# CONFIG_TWL4030_CORE is not set 1061# CONFIG_TWL4030_CORE is not set
1026# CONFIG_MFD_TMIO is not set 1062# CONFIG_MFD_TMIO is not set
1027# CONFIG_PMIC_DA903X is not set 1063# CONFIG_PMIC_DA903X is not set
1064# CONFIG_PMIC_ADP5520 is not set
1028# CONFIG_MFD_WM8400 is not set 1065# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set 1066# CONFIG_MFD_WM831X is not set
1030# CONFIG_MFD_WM8350_I2C is not set 1067# CONFIG_MFD_WM8350_I2C is not set
1031# CONFIG_MFD_PCF50633 is not set 1068# CONFIG_MFD_PCF50633 is not set
1032# CONFIG_AB3100_CORE is not set 1069# CONFIG_AB3100_CORE is not set
1070# CONFIG_MFD_88PM8607 is not set
1033# CONFIG_REGULATOR is not set 1071# CONFIG_REGULATOR is not set
1034# CONFIG_MEDIA_SUPPORT is not set 1072# CONFIG_MEDIA_SUPPORT is not set
1035 1073
@@ -1260,7 +1298,7 @@ CONFIG_FRAME_WARN=1024
1260# CONFIG_DEBUG_KERNEL is not set 1298# CONFIG_DEBUG_KERNEL is not set
1261# CONFIG_SLUB_DEBUG_ON is not set 1299# CONFIG_SLUB_DEBUG_ON is not set
1262# CONFIG_SLUB_STATS is not set 1300# CONFIG_SLUB_STATS is not set
1263# CONFIG_DEBUG_BUGVERBOSE is not set 1301CONFIG_DEBUG_BUGVERBOSE=y
1264# CONFIG_DEBUG_MEMORY_INIT is not set 1302# CONFIG_DEBUG_MEMORY_INIT is not set
1265# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1303# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1266# CONFIG_LATENCYTOP is not set 1304# CONFIG_LATENCYTOP is not set
@@ -1286,7 +1324,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1286# CONFIG_KEYS is not set 1324# CONFIG_KEYS is not set
1287# CONFIG_SECURITY is not set 1325# CONFIG_SECURITY is not set
1288# CONFIG_SECURITYFS is not set 1326# CONFIG_SECURITYFS is not set
1289# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1327# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1328# CONFIG_DEFAULT_SECURITY_SMACK is not set
1329# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1330CONFIG_DEFAULT_SECURITY_DAC=y
1331CONFIG_DEFAULT_SECURITY=""
1290CONFIG_CRYPTO=y 1332CONFIG_CRYPTO=y
1291 1333
1292# 1334#
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
index debe268f43d1..5cc89aac3fec 100644
--- a/arch/powerpc/configs/85xx/tqm8548_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8548_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:41 2009 4# Wed Jan 6 09:24:35 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
88# 91#
89CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -177,14 +181,41 @@ CONFIG_LBDAF=y
177# IO Schedulers 181# IO Schedulers
178# 182#
179CONFIG_IOSCHED_NOOP=y 183CONFIG_IOSCHED_NOOP=y
180CONFIG_IOSCHED_AS=y
181CONFIG_IOSCHED_DEADLINE=y 184CONFIG_IOSCHED_DEADLINE=y
182CONFIG_IOSCHED_CFQ=y 185CONFIG_IOSCHED_CFQ=y
183CONFIG_DEFAULT_AS=y
184# CONFIG_DEFAULT_DEADLINE is not set 186# CONFIG_DEFAULT_DEADLINE is not set
185# CONFIG_DEFAULT_CFQ is not set 187CONFIG_DEFAULT_CFQ=y
186# CONFIG_DEFAULT_NOOP is not set 188# CONFIG_DEFAULT_NOOP is not set
187CONFIG_DEFAULT_IOSCHED="anticipatory" 189CONFIG_DEFAULT_IOSCHED="cfq"
190# CONFIG_INLINE_SPIN_TRYLOCK is not set
191# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
192# CONFIG_INLINE_SPIN_LOCK is not set
193# CONFIG_INLINE_SPIN_LOCK_BH is not set
194# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
195# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
196CONFIG_INLINE_SPIN_UNLOCK=y
197# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
198CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
199# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
200# CONFIG_INLINE_READ_TRYLOCK is not set
201# CONFIG_INLINE_READ_LOCK is not set
202# CONFIG_INLINE_READ_LOCK_BH is not set
203# CONFIG_INLINE_READ_LOCK_IRQ is not set
204# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
205CONFIG_INLINE_READ_UNLOCK=y
206# CONFIG_INLINE_READ_UNLOCK_BH is not set
207CONFIG_INLINE_READ_UNLOCK_IRQ=y
208# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
209# CONFIG_INLINE_WRITE_TRYLOCK is not set
210# CONFIG_INLINE_WRITE_LOCK is not set
211# CONFIG_INLINE_WRITE_LOCK_BH is not set
212# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
213# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
214CONFIG_INLINE_WRITE_UNLOCK=y
215# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
216CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
217# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
218# CONFIG_MUTEX_SPIN_ON_OWNER is not set
188# CONFIG_FREEZER is not set 219# CONFIG_FREEZER is not set
189 220
190# 221#
@@ -193,7 +224,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
193# CONFIG_PPC_CELL is not set 224# CONFIG_PPC_CELL is not set
194# CONFIG_PPC_CELL_NATIVE is not set 225# CONFIG_PPC_CELL_NATIVE is not set
195# CONFIG_PQ2ADS is not set 226# CONFIG_PQ2ADS is not set
196CONFIG_MPC85xx=y 227CONFIG_FSL_SOC_BOOKE=y
197# CONFIG_MPC8540_ADS is not set 228# CONFIG_MPC8540_ADS is not set
198# CONFIG_MPC8560_ADS is not set 229# CONFIG_MPC8560_ADS is not set
199# CONFIG_MPC85xx_CDS is not set 230# CONFIG_MPC85xx_CDS is not set
@@ -212,6 +243,7 @@ CONFIG_TQM8548=y
212# CONFIG_TQM8560 is not set 243# CONFIG_TQM8560 is not set
213# CONFIG_SBC8548 is not set 244# CONFIG_SBC8548 is not set
214# CONFIG_SBC8560 is not set 245# CONFIG_SBC8560 is not set
246# CONFIG_P4080_DS is not set
215CONFIG_TQM85xx=y 247CONFIG_TQM85xx=y
216# CONFIG_IPIC is not set 248# CONFIG_IPIC is not set
217CONFIG_MPIC=y 249CONFIG_MPIC=y
@@ -257,6 +289,7 @@ CONFIG_MATH_EMULATION=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 289CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
258CONFIG_ARCH_HAS_WALK_MEMORY=y 290CONFIG_ARCH_HAS_WALK_MEMORY=y
259CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 291CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
292CONFIG_SPARSE_IRQ=y
260CONFIG_MAX_ACTIVE_REGIONS=32 293CONFIG_MAX_ACTIVE_REGIONS=32
261CONFIG_ARCH_FLATMEM_ENABLE=y 294CONFIG_ARCH_FLATMEM_ENABLE=y
262CONFIG_ARCH_POPULATES_NODE_MAP=y 295CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -273,8 +306,6 @@ CONFIG_MIGRATION=y
273CONFIG_ZONE_DMA_FLAG=1 306CONFIG_ZONE_DMA_FLAG=1
274CONFIG_BOUNCE=y 307CONFIG_BOUNCE=y
275CONFIG_VIRT_TO_BUS=y 308CONFIG_VIRT_TO_BUS=y
276CONFIG_HAVE_MLOCK=y
277CONFIG_HAVE_MLOCKED_PAGE_BIT=y
278# CONFIG_KSM is not set 309# CONFIG_KSM is not set
279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 310CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
280CONFIG_PPC_4K_PAGES=y 311CONFIG_PPC_4K_PAGES=y
@@ -406,7 +437,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
406# CONFIG_IRDA is not set 437# CONFIG_IRDA is not set
407# CONFIG_BT is not set 438# CONFIG_BT is not set
408# CONFIG_AF_RXRPC is not set 439# CONFIG_AF_RXRPC is not set
409# CONFIG_WIRELESS is not set 440CONFIG_WIRELESS=y
441# CONFIG_CFG80211 is not set
442# CONFIG_LIB80211 is not set
443
444#
445# CFG80211 needs to be enabled for MAC80211
446#
410# CONFIG_WIMAX is not set 447# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 448# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 449# CONFIG_NET_9P is not set
@@ -535,6 +572,10 @@ CONFIG_BLK_DEV=y
535# CONFIG_BLK_DEV_COW_COMMON is not set 572# CONFIG_BLK_DEV_COW_COMMON is not set
536CONFIG_BLK_DEV_LOOP=y 573CONFIG_BLK_DEV_LOOP=y
537# CONFIG_BLK_DEV_CRYPTOLOOP is not set 574# CONFIG_BLK_DEV_CRYPTOLOOP is not set
575
576#
577# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
578#
538# CONFIG_BLK_DEV_NBD is not set 579# CONFIG_BLK_DEV_NBD is not set
539# CONFIG_BLK_DEV_SX8 is not set 580# CONFIG_BLK_DEV_SX8 is not set
540CONFIG_BLK_DEV_RAM=y 581CONFIG_BLK_DEV_RAM=y
@@ -545,6 +586,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
545# CONFIG_ATA_OVER_ETH is not set 586# CONFIG_ATA_OVER_ETH is not set
546# CONFIG_BLK_DEV_HD is not set 587# CONFIG_BLK_DEV_HD is not set
547CONFIG_MISC_DEVICES=y 588CONFIG_MISC_DEVICES=y
589# CONFIG_AD525X_DPOT is not set
548# CONFIG_PHANTOM is not set 590# CONFIG_PHANTOM is not set
549# CONFIG_SGI_IOC4 is not set 591# CONFIG_SGI_IOC4 is not set
550# CONFIG_TIFM_CORE is not set 592# CONFIG_TIFM_CORE is not set
@@ -552,6 +594,7 @@ CONFIG_MISC_DEVICES=y
552# CONFIG_ENCLOSURE_SERVICES is not set 594# CONFIG_ENCLOSURE_SERVICES is not set
553# CONFIG_HP_ILO is not set 595# CONFIG_HP_ILO is not set
554# CONFIG_ISL29003 is not set 596# CONFIG_ISL29003 is not set
597# CONFIG_DS1682 is not set
555# CONFIG_C2PORT is not set 598# CONFIG_C2PORT is not set
556 599
557# 600#
@@ -585,7 +628,7 @@ CONFIG_HAVE_IDE=y
585# 628#
586 629
587# 630#
588# See the help texts for more information. 631# The newer stack is recommended.
589# 632#
590# CONFIG_FIREWIRE is not set 633# CONFIG_FIREWIRE is not set
591# CONFIG_IEEE1394 is not set 634# CONFIG_IEEE1394 is not set
@@ -690,8 +733,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
690# CONFIG_BE2NET is not set 733# CONFIG_BE2NET is not set
691# CONFIG_TR is not set 734# CONFIG_TR is not set
692CONFIG_WLAN=y 735CONFIG_WLAN=y
693# CONFIG_WLAN_PRE80211 is not set 736# CONFIG_AIRO is not set
694# CONFIG_WLAN_80211 is not set 737# CONFIG_ATMEL is not set
738# CONFIG_PRISM54 is not set
739# CONFIG_HOSTAP is not set
695 740
696# 741#
697# Enable WiMAX (Networking options) to see the WiMAX drivers 742# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -704,6 +749,7 @@ CONFIG_WLAN=y
704# CONFIG_NETCONSOLE is not set 749# CONFIG_NETCONSOLE is not set
705# CONFIG_NETPOLL is not set 750# CONFIG_NETPOLL is not set
706# CONFIG_NET_POLL_CONTROLLER is not set 751# CONFIG_NET_POLL_CONTROLLER is not set
752# CONFIG_VMXNET3 is not set
707# CONFIG_ISDN is not set 753# CONFIG_ISDN is not set
708# CONFIG_PHONE is not set 754# CONFIG_PHONE is not set
709 755
@@ -713,6 +759,7 @@ CONFIG_WLAN=y
713CONFIG_INPUT=y 759CONFIG_INPUT=y
714# CONFIG_INPUT_FF_MEMLESS is not set 760# CONFIG_INPUT_FF_MEMLESS is not set
715# CONFIG_INPUT_POLLDEV is not set 761# CONFIG_INPUT_POLLDEV is not set
762# CONFIG_INPUT_SPARSEKMAP is not set
716 763
717# 764#
718# Userland interfaces 765# Userland interfaces
@@ -765,6 +812,7 @@ CONFIG_SERIAL_CORE=y
765CONFIG_SERIAL_CORE_CONSOLE=y 812CONFIG_SERIAL_CORE_CONSOLE=y
766# CONFIG_SERIAL_JSM is not set 813# CONFIG_SERIAL_JSM is not set
767# CONFIG_SERIAL_OF_PLATFORM is not set 814# CONFIG_SERIAL_OF_PLATFORM is not set
815# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
768CONFIG_UNIX98_PTYS=y 816CONFIG_UNIX98_PTYS=y
769# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 817# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
770CONFIG_LEGACY_PTYS=y 818CONFIG_LEGACY_PTYS=y
@@ -820,11 +868,6 @@ CONFIG_I2C_MPC=y
820# CONFIG_I2C_TAOS_EVM is not set 868# CONFIG_I2C_TAOS_EVM is not set
821 869
822# 870#
823# Graphics adapter I2C/DDC channel drivers
824#
825# CONFIG_I2C_VOODOO3 is not set
826
827#
828# Other I2C/SMBus bus drivers 871# Other I2C/SMBus bus drivers
829# 872#
830# CONFIG_I2C_PCA_PLATFORM is not set 873# CONFIG_I2C_PCA_PLATFORM is not set
@@ -833,7 +876,6 @@ CONFIG_I2C_MPC=y
833# 876#
834# Miscellaneous I2C Chip support 877# Miscellaneous I2C Chip support
835# 878#
836# CONFIG_DS1682 is not set
837# CONFIG_SENSORS_TSL2550 is not set 879# CONFIG_SENSORS_TSL2550 is not set
838# CONFIG_I2C_DEBUG_CORE is not set 880# CONFIG_I2C_DEBUG_CORE is not set
839# CONFIG_I2C_DEBUG_ALGO is not set 881# CONFIG_I2C_DEBUG_ALGO is not set
@@ -879,6 +921,7 @@ CONFIG_HWMON=y
879# CONFIG_SENSORS_GL520SM is not set 921# CONFIG_SENSORS_GL520SM is not set
880# CONFIG_SENSORS_IT87 is not set 922# CONFIG_SENSORS_IT87 is not set
881# CONFIG_SENSORS_LM63 is not set 923# CONFIG_SENSORS_LM63 is not set
924# CONFIG_SENSORS_LM73 is not set
882CONFIG_SENSORS_LM75=y 925CONFIG_SENSORS_LM75=y
883# CONFIG_SENSORS_LM77 is not set 926# CONFIG_SENSORS_LM77 is not set
884# CONFIG_SENSORS_LM78 is not set 927# CONFIG_SENSORS_LM78 is not set
@@ -917,6 +960,7 @@ CONFIG_SENSORS_LM75=y
917# CONFIG_SENSORS_W83L786NG is not set 960# CONFIG_SENSORS_W83L786NG is not set
918# CONFIG_SENSORS_W83627HF is not set 961# CONFIG_SENSORS_W83627HF is not set
919# CONFIG_SENSORS_W83627EHF is not set 962# CONFIG_SENSORS_W83627EHF is not set
963# CONFIG_SENSORS_LIS3_I2C is not set
920# CONFIG_THERMAL is not set 964# CONFIG_THERMAL is not set
921# CONFIG_WATCHDOG is not set 965# CONFIG_WATCHDOG is not set
922CONFIG_SSB_POSSIBLE=y 966CONFIG_SSB_POSSIBLE=y
@@ -935,11 +979,13 @@ CONFIG_SSB_POSSIBLE=y
935# CONFIG_TWL4030_CORE is not set 979# CONFIG_TWL4030_CORE is not set
936# CONFIG_MFD_TMIO is not set 980# CONFIG_MFD_TMIO is not set
937# CONFIG_PMIC_DA903X is not set 981# CONFIG_PMIC_DA903X is not set
982# CONFIG_PMIC_ADP5520 is not set
938# CONFIG_MFD_WM8400 is not set 983# CONFIG_MFD_WM8400 is not set
939# CONFIG_MFD_WM831X is not set 984# CONFIG_MFD_WM831X is not set
940# CONFIG_MFD_WM8350_I2C is not set 985# CONFIG_MFD_WM8350_I2C is not set
941# CONFIG_MFD_PCF50633 is not set 986# CONFIG_MFD_PCF50633 is not set
942# CONFIG_AB3100_CORE is not set 987# CONFIG_AB3100_CORE is not set
988# CONFIG_MFD_88PM8607 is not set
943# CONFIG_REGULATOR is not set 989# CONFIG_REGULATOR is not set
944# CONFIG_MEDIA_SUPPORT is not set 990# CONFIG_MEDIA_SUPPORT is not set
945 991
@@ -1003,6 +1049,7 @@ CONFIG_RTC_DRV_DS1307=y
1003# CONFIG_RTC_DRV_PCF8563 is not set 1049# CONFIG_RTC_DRV_PCF8563 is not set
1004# CONFIG_RTC_DRV_PCF8583 is not set 1050# CONFIG_RTC_DRV_PCF8583 is not set
1005# CONFIG_RTC_DRV_M41T80 is not set 1051# CONFIG_RTC_DRV_M41T80 is not set
1052# CONFIG_RTC_DRV_BQ32K is not set
1006# CONFIG_RTC_DRV_S35390A is not set 1053# CONFIG_RTC_DRV_S35390A is not set
1007# CONFIG_RTC_DRV_FM3130 is not set 1054# CONFIG_RTC_DRV_FM3130 is not set
1008# CONFIG_RTC_DRV_RX8581 is not set 1055# CONFIG_RTC_DRV_RX8581 is not set
@@ -1024,7 +1071,9 @@ CONFIG_RTC_DRV_DS1307=y
1024# CONFIG_RTC_DRV_M48T86 is not set 1071# CONFIG_RTC_DRV_M48T86 is not set
1025# CONFIG_RTC_DRV_M48T35 is not set 1072# CONFIG_RTC_DRV_M48T35 is not set
1026# CONFIG_RTC_DRV_M48T59 is not set 1073# CONFIG_RTC_DRV_M48T59 is not set
1074# CONFIG_RTC_DRV_MSM6242 is not set
1027# CONFIG_RTC_DRV_BQ4802 is not set 1075# CONFIG_RTC_DRV_BQ4802 is not set
1076# CONFIG_RTC_DRV_RP5C01 is not set
1028# CONFIG_RTC_DRV_V3020 is not set 1077# CONFIG_RTC_DRV_V3020 is not set
1029 1078
1030# 1079#
@@ -1280,7 +1329,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1280# CONFIG_KEYS is not set 1329# CONFIG_KEYS is not set
1281# CONFIG_SECURITY is not set 1330# CONFIG_SECURITY is not set
1282# CONFIG_SECURITYFS is not set 1331# CONFIG_SECURITYFS is not set
1283# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1332# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1333# CONFIG_DEFAULT_SECURITY_SMACK is not set
1334# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1335CONFIG_DEFAULT_SECURITY_DAC=y
1336CONFIG_DEFAULT_SECURITY=""
1284CONFIG_CRYPTO=y 1337CONFIG_CRYPTO=y
1285 1338
1286# 1339#
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig
index 74515501f5b7..e7b9148e58cf 100644
--- a/arch/powerpc/configs/85xx/tqm8555_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8555_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:42 2009 4# Wed Jan 6 09:24:36 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +175,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 175# IO Schedulers
172# 176#
173CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
183 214
184# 215#
@@ -187,7 +218,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
187# CONFIG_PPC_CELL is not set 218# CONFIG_PPC_CELL is not set
188# CONFIG_PPC_CELL_NATIVE is not set 219# CONFIG_PPC_CELL_NATIVE is not set
189# CONFIG_PQ2ADS is not set 220# CONFIG_PQ2ADS is not set
190CONFIG_MPC85xx=y 221CONFIG_FSL_SOC_BOOKE=y
191# CONFIG_MPC8540_ADS is not set 222# CONFIG_MPC8540_ADS is not set
192# CONFIG_MPC8560_ADS is not set 223# CONFIG_MPC8560_ADS is not set
193# CONFIG_MPC85xx_CDS is not set 224# CONFIG_MPC85xx_CDS is not set
@@ -206,6 +237,7 @@ CONFIG_TQM8555=y
206# CONFIG_TQM8560 is not set 237# CONFIG_TQM8560 is not set
207# CONFIG_SBC8548 is not set 238# CONFIG_SBC8548 is not set
208# CONFIG_SBC8560 is not set 239# CONFIG_SBC8560 is not set
240# CONFIG_P4080_DS is not set
209CONFIG_TQM85xx=y 241CONFIG_TQM85xx=y
210# CONFIG_IPIC is not set 242# CONFIG_IPIC is not set
211CONFIG_MPIC=y 243CONFIG_MPIC=y
@@ -251,6 +283,7 @@ CONFIG_MATH_EMULATION=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
252CONFIG_ARCH_HAS_WALK_MEMORY=y 284CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
286CONFIG_SPARSE_IRQ=y
254CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -267,8 +300,6 @@ CONFIG_MIGRATION=y
267CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
268CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set 303# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
274CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -394,9 +425,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_AF_RXRPC is not set 425# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
401 429
402# 430#
@@ -514,6 +542,10 @@ CONFIG_BLK_DEV=y
514# CONFIG_BLK_DEV_COW_COMMON is not set 542# CONFIG_BLK_DEV_COW_COMMON is not set
515CONFIG_BLK_DEV_LOOP=y 543CONFIG_BLK_DEV_LOOP=y
516# CONFIG_BLK_DEV_CRYPTOLOOP is not set 544# CONFIG_BLK_DEV_CRYPTOLOOP is not set
545
546#
547# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
548#
517# CONFIG_BLK_DEV_NBD is not set 549# CONFIG_BLK_DEV_NBD is not set
518# CONFIG_BLK_DEV_SX8 is not set 550# CONFIG_BLK_DEV_SX8 is not set
519CONFIG_BLK_DEV_RAM=y 551CONFIG_BLK_DEV_RAM=y
@@ -524,6 +556,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
524# CONFIG_ATA_OVER_ETH is not set 556# CONFIG_ATA_OVER_ETH is not set
525# CONFIG_BLK_DEV_HD is not set 557# CONFIG_BLK_DEV_HD is not set
526CONFIG_MISC_DEVICES=y 558CONFIG_MISC_DEVICES=y
559# CONFIG_AD525X_DPOT is not set
527# CONFIG_PHANTOM is not set 560# CONFIG_PHANTOM is not set
528# CONFIG_SGI_IOC4 is not set 561# CONFIG_SGI_IOC4 is not set
529# CONFIG_TIFM_CORE is not set 562# CONFIG_TIFM_CORE is not set
@@ -531,6 +564,7 @@ CONFIG_MISC_DEVICES=y
531# CONFIG_ENCLOSURE_SERVICES is not set 564# CONFIG_ENCLOSURE_SERVICES is not set
532# CONFIG_HP_ILO is not set 565# CONFIG_HP_ILO is not set
533# CONFIG_ISL29003 is not set 566# CONFIG_ISL29003 is not set
567# CONFIG_DS1682 is not set
534# CONFIG_C2PORT is not set 568# CONFIG_C2PORT is not set
535 569
536# 570#
@@ -619,7 +653,7 @@ CONFIG_BLK_DEV_IDEDMA=y
619# 653#
620 654
621# 655#
622# See the help texts for more information. 656# The newer stack is recommended.
623# 657#
624# CONFIG_FIREWIRE is not set 658# CONFIG_FIREWIRE is not set
625# CONFIG_IEEE1394 is not set 659# CONFIG_IEEE1394 is not set
@@ -743,8 +777,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
743# CONFIG_BE2NET is not set 777# CONFIG_BE2NET is not set
744# CONFIG_TR is not set 778# CONFIG_TR is not set
745CONFIG_WLAN=y 779CONFIG_WLAN=y
746# CONFIG_WLAN_PRE80211 is not set 780# CONFIG_AIRO is not set
747# CONFIG_WLAN_80211 is not set 781# CONFIG_ATMEL is not set
782# CONFIG_PRISM54 is not set
783# CONFIG_HOSTAP is not set
748 784
749# 785#
750# Enable WiMAX (Networking options) to see the WiMAX drivers 786# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -757,6 +793,7 @@ CONFIG_WLAN=y
757# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
758# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
759# CONFIG_NET_POLL_CONTROLLER is not set 795# CONFIG_NET_POLL_CONTROLLER is not set
796# CONFIG_VMXNET3 is not set
760# CONFIG_ISDN is not set 797# CONFIG_ISDN is not set
761# CONFIG_PHONE is not set 798# CONFIG_PHONE is not set
762 799
@@ -766,6 +803,7 @@ CONFIG_WLAN=y
766CONFIG_INPUT=y 803CONFIG_INPUT=y
767# CONFIG_INPUT_FF_MEMLESS is not set 804# CONFIG_INPUT_FF_MEMLESS is not set
768# CONFIG_INPUT_POLLDEV is not set 805# CONFIG_INPUT_POLLDEV is not set
806# CONFIG_INPUT_SPARSEKMAP is not set
769 807
770# 808#
771# Userland interfaces 809# Userland interfaces
@@ -820,6 +858,7 @@ CONFIG_SERIAL_CPM=y
820CONFIG_SERIAL_CPM_CONSOLE=y 858CONFIG_SERIAL_CPM_CONSOLE=y
821# CONFIG_SERIAL_JSM is not set 859# CONFIG_SERIAL_JSM is not set
822# CONFIG_SERIAL_OF_PLATFORM is not set 860# CONFIG_SERIAL_OF_PLATFORM is not set
861# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
823CONFIG_UNIX98_PTYS=y 862CONFIG_UNIX98_PTYS=y
824# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 863# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
825CONFIG_LEGACY_PTYS=y 864CONFIG_LEGACY_PTYS=y
@@ -881,11 +920,6 @@ CONFIG_I2C_MPC=y
881# CONFIG_I2C_TAOS_EVM is not set 920# CONFIG_I2C_TAOS_EVM is not set
882 921
883# 922#
884# Graphics adapter I2C/DDC channel drivers
885#
886# CONFIG_I2C_VOODOO3 is not set
887
888#
889# Other I2C/SMBus bus drivers 923# Other I2C/SMBus bus drivers
890# 924#
891# CONFIG_I2C_PCA_PLATFORM is not set 925# CONFIG_I2C_PCA_PLATFORM is not set
@@ -893,7 +927,6 @@ CONFIG_I2C_MPC=y
893# 927#
894# Miscellaneous I2C Chip support 928# Miscellaneous I2C Chip support
895# 929#
896# CONFIG_DS1682 is not set
897# CONFIG_SENSORS_TSL2550 is not set 930# CONFIG_SENSORS_TSL2550 is not set
898# CONFIG_I2C_DEBUG_CORE is not set 931# CONFIG_I2C_DEBUG_CORE is not set
899# CONFIG_I2C_DEBUG_ALGO is not set 932# CONFIG_I2C_DEBUG_ALGO is not set
@@ -925,6 +958,7 @@ CONFIG_GPIOLIB=y
925# 958#
926# PCI GPIO expanders: 959# PCI GPIO expanders:
927# 960#
961# CONFIG_GPIO_CS5535 is not set
928# CONFIG_GPIO_BT8XX is not set 962# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set 963# CONFIG_GPIO_LANGWELL is not set
930 964
@@ -967,6 +1001,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
967# CONFIG_SENSORS_GL520SM is not set 1001# CONFIG_SENSORS_GL520SM is not set
968# CONFIG_SENSORS_IT87 is not set 1002# CONFIG_SENSORS_IT87 is not set
969# CONFIG_SENSORS_LM63 is not set 1003# CONFIG_SENSORS_LM63 is not set
1004# CONFIG_SENSORS_LM73 is not set
970CONFIG_SENSORS_LM75=y 1005CONFIG_SENSORS_LM75=y
971# CONFIG_SENSORS_LM77 is not set 1006# CONFIG_SENSORS_LM77 is not set
972# CONFIG_SENSORS_LM78 is not set 1007# CONFIG_SENSORS_LM78 is not set
@@ -1006,6 +1041,7 @@ CONFIG_SENSORS_LM75=y
1006# CONFIG_SENSORS_W83L786NG is not set 1041# CONFIG_SENSORS_W83L786NG is not set
1007# CONFIG_SENSORS_W83627HF is not set 1042# CONFIG_SENSORS_W83627HF is not set
1008# CONFIG_SENSORS_W83627EHF is not set 1043# CONFIG_SENSORS_W83627EHF is not set
1044# CONFIG_SENSORS_LIS3_I2C is not set
1009# CONFIG_THERMAL is not set 1045# CONFIG_THERMAL is not set
1010# CONFIG_WATCHDOG is not set 1046# CONFIG_WATCHDOG is not set
1011CONFIG_SSB_POSSIBLE=y 1047CONFIG_SSB_POSSIBLE=y
@@ -1025,11 +1061,13 @@ CONFIG_SSB_POSSIBLE=y
1025# CONFIG_TWL4030_CORE is not set 1061# CONFIG_TWL4030_CORE is not set
1026# CONFIG_MFD_TMIO is not set 1062# CONFIG_MFD_TMIO is not set
1027# CONFIG_PMIC_DA903X is not set 1063# CONFIG_PMIC_DA903X is not set
1064# CONFIG_PMIC_ADP5520 is not set
1028# CONFIG_MFD_WM8400 is not set 1065# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set 1066# CONFIG_MFD_WM831X is not set
1030# CONFIG_MFD_WM8350_I2C is not set 1067# CONFIG_MFD_WM8350_I2C is not set
1031# CONFIG_MFD_PCF50633 is not set 1068# CONFIG_MFD_PCF50633 is not set
1032# CONFIG_AB3100_CORE is not set 1069# CONFIG_AB3100_CORE is not set
1070# CONFIG_MFD_88PM8607 is not set
1033# CONFIG_REGULATOR is not set 1071# CONFIG_REGULATOR is not set
1034# CONFIG_MEDIA_SUPPORT is not set 1072# CONFIG_MEDIA_SUPPORT is not set
1035 1073
@@ -1260,7 +1298,7 @@ CONFIG_FRAME_WARN=1024
1260# CONFIG_DEBUG_KERNEL is not set 1298# CONFIG_DEBUG_KERNEL is not set
1261# CONFIG_SLUB_DEBUG_ON is not set 1299# CONFIG_SLUB_DEBUG_ON is not set
1262# CONFIG_SLUB_STATS is not set 1300# CONFIG_SLUB_STATS is not set
1263# CONFIG_DEBUG_BUGVERBOSE is not set 1301CONFIG_DEBUG_BUGVERBOSE=y
1264# CONFIG_DEBUG_MEMORY_INIT is not set 1302# CONFIG_DEBUG_MEMORY_INIT is not set
1265# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1303# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1266# CONFIG_LATENCYTOP is not set 1304# CONFIG_LATENCYTOP is not set
@@ -1286,7 +1324,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1286# CONFIG_KEYS is not set 1324# CONFIG_KEYS is not set
1287# CONFIG_SECURITY is not set 1325# CONFIG_SECURITY is not set
1288# CONFIG_SECURITYFS is not set 1326# CONFIG_SECURITYFS is not set
1289# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1327# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1328# CONFIG_DEFAULT_SECURITY_SMACK is not set
1329# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1330CONFIG_DEFAULT_SECURITY_DAC=y
1331CONFIG_DEFAULT_SECURITY=""
1290CONFIG_CRYPTO=y 1332CONFIG_CRYPTO=y
1291 1333
1292# 1334#
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig
index 631d92b4d4e6..a998e401bbfc 100644
--- a/arch/powerpc/configs/85xx/tqm8560_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8560_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:43 2009 4# Wed Jan 6 09:24:36 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -89,6 +92,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 92#
90CONFIG_TREE_RCU=y 93CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 94# CONFIG_TREE_PREEMPT_RCU is not set
95# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 96# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 97CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 98# CONFIG_RCU_FANOUT_EXACT is not set
@@ -171,14 +175,41 @@ CONFIG_LBDAF=y
171# IO Schedulers 175# IO Schedulers
172# 176#
173CONFIG_IOSCHED_NOOP=y 177CONFIG_IOSCHED_NOOP=y
174CONFIG_IOSCHED_AS=y
175CONFIG_IOSCHED_DEADLINE=y 178CONFIG_IOSCHED_DEADLINE=y
176CONFIG_IOSCHED_CFQ=y 179CONFIG_IOSCHED_CFQ=y
177CONFIG_DEFAULT_AS=y
178# CONFIG_DEFAULT_DEADLINE is not set 180# CONFIG_DEFAULT_DEADLINE is not set
179# CONFIG_DEFAULT_CFQ is not set 181CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 182# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="anticipatory" 183CONFIG_DEFAULT_IOSCHED="cfq"
184# CONFIG_INLINE_SPIN_TRYLOCK is not set
185# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK is not set
187# CONFIG_INLINE_SPIN_LOCK_BH is not set
188# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
189# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
190CONFIG_INLINE_SPIN_UNLOCK=y
191# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
192CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
193# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
194# CONFIG_INLINE_READ_TRYLOCK is not set
195# CONFIG_INLINE_READ_LOCK is not set
196# CONFIG_INLINE_READ_LOCK_BH is not set
197# CONFIG_INLINE_READ_LOCK_IRQ is not set
198# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
199CONFIG_INLINE_READ_UNLOCK=y
200# CONFIG_INLINE_READ_UNLOCK_BH is not set
201CONFIG_INLINE_READ_UNLOCK_IRQ=y
202# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_WRITE_TRYLOCK is not set
204# CONFIG_INLINE_WRITE_LOCK is not set
205# CONFIG_INLINE_WRITE_LOCK_BH is not set
206# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
207# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
208CONFIG_INLINE_WRITE_UNLOCK=y
209# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
210CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
211# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
212# CONFIG_MUTEX_SPIN_ON_OWNER is not set
182# CONFIG_FREEZER is not set 213# CONFIG_FREEZER is not set
183 214
184# 215#
@@ -187,7 +218,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
187# CONFIG_PPC_CELL is not set 218# CONFIG_PPC_CELL is not set
188# CONFIG_PPC_CELL_NATIVE is not set 219# CONFIG_PPC_CELL_NATIVE is not set
189# CONFIG_PQ2ADS is not set 220# CONFIG_PQ2ADS is not set
190CONFIG_MPC85xx=y 221CONFIG_FSL_SOC_BOOKE=y
191# CONFIG_MPC8540_ADS is not set 222# CONFIG_MPC8540_ADS is not set
192# CONFIG_MPC8560_ADS is not set 223# CONFIG_MPC8560_ADS is not set
193# CONFIG_MPC85xx_CDS is not set 224# CONFIG_MPC85xx_CDS is not set
@@ -206,6 +237,7 @@ CONFIG_MPC85xx=y
206CONFIG_TQM8560=y 237CONFIG_TQM8560=y
207# CONFIG_SBC8548 is not set 238# CONFIG_SBC8548 is not set
208# CONFIG_SBC8560 is not set 239# CONFIG_SBC8560 is not set
240# CONFIG_P4080_DS is not set
209CONFIG_TQM85xx=y 241CONFIG_TQM85xx=y
210# CONFIG_IPIC is not set 242# CONFIG_IPIC is not set
211CONFIG_MPIC=y 243CONFIG_MPIC=y
@@ -251,6 +283,7 @@ CONFIG_MATH_EMULATION=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 283CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
252CONFIG_ARCH_HAS_WALK_MEMORY=y 284CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
286CONFIG_SPARSE_IRQ=y
254CONFIG_MAX_ACTIVE_REGIONS=32 287CONFIG_MAX_ACTIVE_REGIONS=32
255CONFIG_ARCH_FLATMEM_ENABLE=y 288CONFIG_ARCH_FLATMEM_ENABLE=y
256CONFIG_ARCH_POPULATES_NODE_MAP=y 289CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -267,8 +300,6 @@ CONFIG_MIGRATION=y
267CONFIG_ZONE_DMA_FLAG=1 300CONFIG_ZONE_DMA_FLAG=1
268CONFIG_BOUNCE=y 301CONFIG_BOUNCE=y
269CONFIG_VIRT_TO_BUS=y 302CONFIG_VIRT_TO_BUS=y
270CONFIG_HAVE_MLOCK=y
271CONFIG_HAVE_MLOCKED_PAGE_BIT=y
272# CONFIG_KSM is not set 303# CONFIG_KSM is not set
273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
274CONFIG_PPC_4K_PAGES=y 305CONFIG_PPC_4K_PAGES=y
@@ -394,9 +425,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_AF_RXRPC is not set 425# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
401 429
402# 430#
@@ -514,6 +542,10 @@ CONFIG_BLK_DEV=y
514# CONFIG_BLK_DEV_COW_COMMON is not set 542# CONFIG_BLK_DEV_COW_COMMON is not set
515CONFIG_BLK_DEV_LOOP=y 543CONFIG_BLK_DEV_LOOP=y
516# CONFIG_BLK_DEV_CRYPTOLOOP is not set 544# CONFIG_BLK_DEV_CRYPTOLOOP is not set
545
546#
547# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
548#
517# CONFIG_BLK_DEV_NBD is not set 549# CONFIG_BLK_DEV_NBD is not set
518# CONFIG_BLK_DEV_SX8 is not set 550# CONFIG_BLK_DEV_SX8 is not set
519CONFIG_BLK_DEV_RAM=y 551CONFIG_BLK_DEV_RAM=y
@@ -524,6 +556,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
524# CONFIG_ATA_OVER_ETH is not set 556# CONFIG_ATA_OVER_ETH is not set
525# CONFIG_BLK_DEV_HD is not set 557# CONFIG_BLK_DEV_HD is not set
526CONFIG_MISC_DEVICES=y 558CONFIG_MISC_DEVICES=y
559# CONFIG_AD525X_DPOT is not set
527# CONFIG_PHANTOM is not set 560# CONFIG_PHANTOM is not set
528# CONFIG_SGI_IOC4 is not set 561# CONFIG_SGI_IOC4 is not set
529# CONFIG_TIFM_CORE is not set 562# CONFIG_TIFM_CORE is not set
@@ -531,6 +564,7 @@ CONFIG_MISC_DEVICES=y
531# CONFIG_ENCLOSURE_SERVICES is not set 564# CONFIG_ENCLOSURE_SERVICES is not set
532# CONFIG_HP_ILO is not set 565# CONFIG_HP_ILO is not set
533# CONFIG_ISL29003 is not set 566# CONFIG_ISL29003 is not set
567# CONFIG_DS1682 is not set
534# CONFIG_C2PORT is not set 568# CONFIG_C2PORT is not set
535 569
536# 570#
@@ -619,7 +653,7 @@ CONFIG_BLK_DEV_IDEDMA=y
619# 653#
620 654
621# 655#
622# See the help texts for more information. 656# The newer stack is recommended.
623# 657#
624# CONFIG_FIREWIRE is not set 658# CONFIG_FIREWIRE is not set
625# CONFIG_IEEE1394 is not set 659# CONFIG_IEEE1394 is not set
@@ -743,8 +777,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
743# CONFIG_BE2NET is not set 777# CONFIG_BE2NET is not set
744# CONFIG_TR is not set 778# CONFIG_TR is not set
745CONFIG_WLAN=y 779CONFIG_WLAN=y
746# CONFIG_WLAN_PRE80211 is not set 780# CONFIG_AIRO is not set
747# CONFIG_WLAN_80211 is not set 781# CONFIG_ATMEL is not set
782# CONFIG_PRISM54 is not set
783# CONFIG_HOSTAP is not set
748 784
749# 785#
750# Enable WiMAX (Networking options) to see the WiMAX drivers 786# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -757,6 +793,7 @@ CONFIG_WLAN=y
757# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
758# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
759# CONFIG_NET_POLL_CONTROLLER is not set 795# CONFIG_NET_POLL_CONTROLLER is not set
796# CONFIG_VMXNET3 is not set
760# CONFIG_ISDN is not set 797# CONFIG_ISDN is not set
761# CONFIG_PHONE is not set 798# CONFIG_PHONE is not set
762 799
@@ -766,6 +803,7 @@ CONFIG_WLAN=y
766CONFIG_INPUT=y 803CONFIG_INPUT=y
767# CONFIG_INPUT_FF_MEMLESS is not set 804# CONFIG_INPUT_FF_MEMLESS is not set
768# CONFIG_INPUT_POLLDEV is not set 805# CONFIG_INPUT_POLLDEV is not set
806# CONFIG_INPUT_SPARSEKMAP is not set
769 807
770# 808#
771# Userland interfaces 809# Userland interfaces
@@ -820,6 +858,7 @@ CONFIG_SERIAL_CPM=y
820CONFIG_SERIAL_CPM_CONSOLE=y 858CONFIG_SERIAL_CPM_CONSOLE=y
821# CONFIG_SERIAL_JSM is not set 859# CONFIG_SERIAL_JSM is not set
822# CONFIG_SERIAL_OF_PLATFORM is not set 860# CONFIG_SERIAL_OF_PLATFORM is not set
861# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
823CONFIG_UNIX98_PTYS=y 862CONFIG_UNIX98_PTYS=y
824# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 863# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
825CONFIG_LEGACY_PTYS=y 864CONFIG_LEGACY_PTYS=y
@@ -881,11 +920,6 @@ CONFIG_I2C_MPC=y
881# CONFIG_I2C_TAOS_EVM is not set 920# CONFIG_I2C_TAOS_EVM is not set
882 921
883# 922#
884# Graphics adapter I2C/DDC channel drivers
885#
886# CONFIG_I2C_VOODOO3 is not set
887
888#
889# Other I2C/SMBus bus drivers 923# Other I2C/SMBus bus drivers
890# 924#
891# CONFIG_I2C_PCA_PLATFORM is not set 925# CONFIG_I2C_PCA_PLATFORM is not set
@@ -893,7 +927,6 @@ CONFIG_I2C_MPC=y
893# 927#
894# Miscellaneous I2C Chip support 928# Miscellaneous I2C Chip support
895# 929#
896# CONFIG_DS1682 is not set
897# CONFIG_SENSORS_TSL2550 is not set 930# CONFIG_SENSORS_TSL2550 is not set
898# CONFIG_I2C_DEBUG_CORE is not set 931# CONFIG_I2C_DEBUG_CORE is not set
899# CONFIG_I2C_DEBUG_ALGO is not set 932# CONFIG_I2C_DEBUG_ALGO is not set
@@ -925,6 +958,7 @@ CONFIG_GPIOLIB=y
925# 958#
926# PCI GPIO expanders: 959# PCI GPIO expanders:
927# 960#
961# CONFIG_GPIO_CS5535 is not set
928# CONFIG_GPIO_BT8XX is not set 962# CONFIG_GPIO_BT8XX is not set
929# CONFIG_GPIO_LANGWELL is not set 963# CONFIG_GPIO_LANGWELL is not set
930 964
@@ -967,6 +1001,7 @@ CONFIG_HWMON_DEBUG_CHIP=y
967# CONFIG_SENSORS_GL520SM is not set 1001# CONFIG_SENSORS_GL520SM is not set
968# CONFIG_SENSORS_IT87 is not set 1002# CONFIG_SENSORS_IT87 is not set
969# CONFIG_SENSORS_LM63 is not set 1003# CONFIG_SENSORS_LM63 is not set
1004# CONFIG_SENSORS_LM73 is not set
970CONFIG_SENSORS_LM75=y 1005CONFIG_SENSORS_LM75=y
971# CONFIG_SENSORS_LM77 is not set 1006# CONFIG_SENSORS_LM77 is not set
972# CONFIG_SENSORS_LM78 is not set 1007# CONFIG_SENSORS_LM78 is not set
@@ -1006,6 +1041,7 @@ CONFIG_SENSORS_LM75=y
1006# CONFIG_SENSORS_W83L786NG is not set 1041# CONFIG_SENSORS_W83L786NG is not set
1007# CONFIG_SENSORS_W83627HF is not set 1042# CONFIG_SENSORS_W83627HF is not set
1008# CONFIG_SENSORS_W83627EHF is not set 1043# CONFIG_SENSORS_W83627EHF is not set
1044# CONFIG_SENSORS_LIS3_I2C is not set
1009# CONFIG_THERMAL is not set 1045# CONFIG_THERMAL is not set
1010# CONFIG_WATCHDOG is not set 1046# CONFIG_WATCHDOG is not set
1011CONFIG_SSB_POSSIBLE=y 1047CONFIG_SSB_POSSIBLE=y
@@ -1025,11 +1061,13 @@ CONFIG_SSB_POSSIBLE=y
1025# CONFIG_TWL4030_CORE is not set 1061# CONFIG_TWL4030_CORE is not set
1026# CONFIG_MFD_TMIO is not set 1062# CONFIG_MFD_TMIO is not set
1027# CONFIG_PMIC_DA903X is not set 1063# CONFIG_PMIC_DA903X is not set
1064# CONFIG_PMIC_ADP5520 is not set
1028# CONFIG_MFD_WM8400 is not set 1065# CONFIG_MFD_WM8400 is not set
1029# CONFIG_MFD_WM831X is not set 1066# CONFIG_MFD_WM831X is not set
1030# CONFIG_MFD_WM8350_I2C is not set 1067# CONFIG_MFD_WM8350_I2C is not set
1031# CONFIG_MFD_PCF50633 is not set 1068# CONFIG_MFD_PCF50633 is not set
1032# CONFIG_AB3100_CORE is not set 1069# CONFIG_AB3100_CORE is not set
1070# CONFIG_MFD_88PM8607 is not set
1033# CONFIG_REGULATOR is not set 1071# CONFIG_REGULATOR is not set
1034# CONFIG_MEDIA_SUPPORT is not set 1072# CONFIG_MEDIA_SUPPORT is not set
1035 1073
@@ -1260,7 +1298,7 @@ CONFIG_FRAME_WARN=1024
1260# CONFIG_DEBUG_KERNEL is not set 1298# CONFIG_DEBUG_KERNEL is not set
1261# CONFIG_SLUB_DEBUG_ON is not set 1299# CONFIG_SLUB_DEBUG_ON is not set
1262# CONFIG_SLUB_STATS is not set 1300# CONFIG_SLUB_STATS is not set
1263# CONFIG_DEBUG_BUGVERBOSE is not set 1301CONFIG_DEBUG_BUGVERBOSE=y
1264# CONFIG_DEBUG_MEMORY_INIT is not set 1302# CONFIG_DEBUG_MEMORY_INIT is not set
1265# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1303# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1266# CONFIG_LATENCYTOP is not set 1304# CONFIG_LATENCYTOP is not set
@@ -1286,7 +1324,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1286# CONFIG_KEYS is not set 1324# CONFIG_KEYS is not set
1287# CONFIG_SECURITY is not set 1325# CONFIG_SECURITY is not set
1288# CONFIG_SECURITYFS is not set 1326# CONFIG_SECURITYFS is not set
1289# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1327# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1328# CONFIG_DEFAULT_SECURITY_SMACK is not set
1329# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1330CONFIG_DEFAULT_SECURITY_DAC=y
1331CONFIG_DEFAULT_SECURITY=""
1290CONFIG_CRYPTO=y 1332CONFIG_CRYPTO=y
1291 1333
1292# 1334#
diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
index 52acbac0c4fe..fc656af04ea1 100644
--- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
+++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:44 2009 4# Wed Jan 6 09:24:37 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -40,6 +40,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
42CONFIG_IRQ_PER_CPU=y 42CONFIG_IRQ_PER_CPU=y
43CONFIG_NR_IRQS=512
43CONFIG_STACKTRACE_SUPPORT=y 44CONFIG_STACKTRACE_SUPPORT=y
44CONFIG_HAVE_LATENCYTOP_SUPPORT=y 45CONFIG_HAVE_LATENCYTOP_SUPPORT=y
45CONFIG_TRACE_IRQFLAGS_SUPPORT=y 46CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -63,6 +64,8 @@ CONFIG_AUDIT_ARCH=y
63CONFIG_GENERIC_BUG=y 64CONFIG_GENERIC_BUG=y
64CONFIG_DTC=y 65CONFIG_DTC=y
65CONFIG_DEFAULT_UIMAGE=y 66CONFIG_DEFAULT_UIMAGE=y
67CONFIG_ARCH_HIBERNATION_POSSIBLE=y
68CONFIG_ARCH_SUSPEND_POSSIBLE=y
66# CONFIG_PPC_DCR_NATIVE is not set 69# CONFIG_PPC_DCR_NATIVE is not set
67# CONFIG_PPC_DCR_MMIO is not set 70# CONFIG_PPC_DCR_MMIO is not set
68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 71CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -93,6 +96,7 @@ CONFIG_AUDIT=y
93# 96#
94CONFIG_TREE_RCU=y 97CONFIG_TREE_RCU=y
95# CONFIG_TREE_PREEMPT_RCU is not set 98# CONFIG_TREE_PREEMPT_RCU is not set
99# CONFIG_TINY_RCU is not set
96# CONFIG_RCU_TRACE is not set 100# CONFIG_RCU_TRACE is not set
97CONFIG_RCU_FANOUT=32 101CONFIG_RCU_FANOUT=32
98# CONFIG_RCU_FANOUT_EXACT is not set 102# CONFIG_RCU_FANOUT_EXACT is not set
@@ -181,14 +185,41 @@ CONFIG_LBDAF=y
181# IO Schedulers 185# IO Schedulers
182# 186#
183CONFIG_IOSCHED_NOOP=y 187CONFIG_IOSCHED_NOOP=y
184CONFIG_IOSCHED_AS=y
185CONFIG_IOSCHED_DEADLINE=y 188CONFIG_IOSCHED_DEADLINE=y
186CONFIG_IOSCHED_CFQ=y 189CONFIG_IOSCHED_CFQ=y
187# CONFIG_DEFAULT_AS is not set
188# CONFIG_DEFAULT_DEADLINE is not set 190# CONFIG_DEFAULT_DEADLINE is not set
189CONFIG_DEFAULT_CFQ=y 191CONFIG_DEFAULT_CFQ=y
190# CONFIG_DEFAULT_NOOP is not set 192# CONFIG_DEFAULT_NOOP is not set
191CONFIG_DEFAULT_IOSCHED="cfq" 193CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_INLINE_SPIN_TRYLOCK is not set
195# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
196# CONFIG_INLINE_SPIN_LOCK is not set
197# CONFIG_INLINE_SPIN_LOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
200CONFIG_INLINE_SPIN_UNLOCK=y
201# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
202CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
203# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_READ_TRYLOCK is not set
205# CONFIG_INLINE_READ_LOCK is not set
206# CONFIG_INLINE_READ_LOCK_BH is not set
207# CONFIG_INLINE_READ_LOCK_IRQ is not set
208# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
209CONFIG_INLINE_READ_UNLOCK=y
210# CONFIG_INLINE_READ_UNLOCK_BH is not set
211CONFIG_INLINE_READ_UNLOCK_IRQ=y
212# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
213# CONFIG_INLINE_WRITE_TRYLOCK is not set
214# CONFIG_INLINE_WRITE_LOCK is not set
215# CONFIG_INLINE_WRITE_LOCK_BH is not set
216# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
218CONFIG_INLINE_WRITE_UNLOCK=y
219# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
220CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
221# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
222CONFIG_MUTEX_SPIN_ON_OWNER=y
192# CONFIG_FREEZER is not set 223# CONFIG_FREEZER is not set
193CONFIG_PPC_MSI_BITMAP=y 224CONFIG_PPC_MSI_BITMAP=y
194 225
@@ -198,7 +229,7 @@ CONFIG_PPC_MSI_BITMAP=y
198# CONFIG_PPC_CELL is not set 229# CONFIG_PPC_CELL is not set
199# CONFIG_PPC_CELL_NATIVE is not set 230# CONFIG_PPC_CELL_NATIVE is not set
200# CONFIG_PQ2ADS is not set 231# CONFIG_PQ2ADS is not set
201CONFIG_MPC85xx=y 232CONFIG_FSL_SOC_BOOKE=y
202# CONFIG_MPC8540_ADS is not set 233# CONFIG_MPC8540_ADS is not set
203# CONFIG_MPC8560_ADS is not set 234# CONFIG_MPC8560_ADS is not set
204# CONFIG_MPC85xx_CDS is not set 235# CONFIG_MPC85xx_CDS is not set
@@ -217,6 +248,7 @@ CONFIG_XES_MPC85xx=y
217# CONFIG_TQM8560 is not set 248# CONFIG_TQM8560 is not set
218# CONFIG_SBC8548 is not set 249# CONFIG_SBC8548 is not set
219# CONFIG_SBC8560 is not set 250# CONFIG_SBC8560 is not set
251# CONFIG_P4080_DS is not set
220# CONFIG_IPIC is not set 252# CONFIG_IPIC is not set
221CONFIG_MPIC=y 253CONFIG_MPIC=y
222# CONFIG_MPIC_WEIRD is not set 254# CONFIG_MPIC_WEIRD is not set
@@ -261,6 +293,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
261CONFIG_ARCH_HAS_WALK_MEMORY=y 293CONFIG_ARCH_HAS_WALK_MEMORY=y
262CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 294CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
263# CONFIG_IRQ_ALL_CPUS is not set 295# CONFIG_IRQ_ALL_CPUS is not set
296CONFIG_SPARSE_IRQ=y
264CONFIG_MAX_ACTIVE_REGIONS=32 297CONFIG_MAX_ACTIVE_REGIONS=32
265CONFIG_ARCH_FLATMEM_ENABLE=y 298CONFIG_ARCH_FLATMEM_ENABLE=y
266CONFIG_ARCH_POPULATES_NODE_MAP=y 299CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -277,8 +310,6 @@ CONFIG_MIGRATION=y
277CONFIG_ZONE_DMA_FLAG=1 310CONFIG_ZONE_DMA_FLAG=1
278CONFIG_BOUNCE=y 311CONFIG_BOUNCE=y
279CONFIG_VIRT_TO_BUS=y 312CONFIG_VIRT_TO_BUS=y
280CONFIG_HAVE_MLOCK=y
281CONFIG_HAVE_MLOCKED_PAGE_BIT=y
282# CONFIG_KSM is not set 313# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 314CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284CONFIG_PPC_4K_PAGES=y 315CONFIG_PPC_4K_PAGES=y
@@ -404,6 +435,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
404CONFIG_INET6_XFRM_MODE_BEET=y 435CONFIG_INET6_XFRM_MODE_BEET=y
405# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 436# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
406CONFIG_IPV6_SIT=y 437CONFIG_IPV6_SIT=y
438# CONFIG_IPV6_SIT_6RD is not set
407CONFIG_IPV6_NDISC_NODETYPE=y 439CONFIG_IPV6_NDISC_NODETYPE=y
408# CONFIG_IPV6_TUNNEL is not set 440# CONFIG_IPV6_TUNNEL is not set
409# CONFIG_IPV6_MULTIPLE_TABLES is not set 441# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -441,7 +473,13 @@ CONFIG_IPV6_NDISC_NODETYPE=y
441# CONFIG_BT is not set 473# CONFIG_BT is not set
442# CONFIG_AF_RXRPC is not set 474# CONFIG_AF_RXRPC is not set
443CONFIG_FIB_RULES=y 475CONFIG_FIB_RULES=y
444# CONFIG_WIRELESS is not set 476CONFIG_WIRELESS=y
477# CONFIG_CFG80211 is not set
478# CONFIG_LIB80211 is not set
479
480#
481# CFG80211 needs to be enabled for MAC80211
482#
445# CONFIG_WIMAX is not set 483# CONFIG_WIMAX is not set
446# CONFIG_RFKILL is not set 484# CONFIG_RFKILL is not set
447# CONFIG_NET_9P is not set 485# CONFIG_NET_9P is not set
@@ -576,6 +614,10 @@ CONFIG_BLK_DEV=y
576# CONFIG_BLK_DEV_COW_COMMON is not set 614# CONFIG_BLK_DEV_COW_COMMON is not set
577CONFIG_BLK_DEV_LOOP=y 615CONFIG_BLK_DEV_LOOP=y
578# CONFIG_BLK_DEV_CRYPTOLOOP is not set 616# CONFIG_BLK_DEV_CRYPTOLOOP is not set
617
618#
619# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
620#
579CONFIG_BLK_DEV_NBD=y 621CONFIG_BLK_DEV_NBD=y
580# CONFIG_BLK_DEV_SX8 is not set 622# CONFIG_BLK_DEV_SX8 is not set
581# CONFIG_BLK_DEV_UB is not set 623# CONFIG_BLK_DEV_UB is not set
@@ -587,6 +629,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
587# CONFIG_ATA_OVER_ETH is not set 629# CONFIG_ATA_OVER_ETH is not set
588# CONFIG_BLK_DEV_HD is not set 630# CONFIG_BLK_DEV_HD is not set
589CONFIG_MISC_DEVICES=y 631CONFIG_MISC_DEVICES=y
632# CONFIG_AD525X_DPOT is not set
590# CONFIG_PHANTOM is not set 633# CONFIG_PHANTOM is not set
591# CONFIG_SGI_IOC4 is not set 634# CONFIG_SGI_IOC4 is not set
592# CONFIG_TIFM_CORE is not set 635# CONFIG_TIFM_CORE is not set
@@ -594,6 +637,7 @@ CONFIG_MISC_DEVICES=y
594# CONFIG_ENCLOSURE_SERVICES is not set 637# CONFIG_ENCLOSURE_SERVICES is not set
595# CONFIG_HP_ILO is not set 638# CONFIG_HP_ILO is not set
596# CONFIG_ISL29003 is not set 639# CONFIG_ISL29003 is not set
640# CONFIG_DS1682 is not set
597# CONFIG_C2PORT is not set 641# CONFIG_C2PORT is not set
598 642
599# 643#
@@ -646,7 +690,9 @@ CONFIG_SCSI_LOWLEVEL=y
646# CONFIG_SCSI_BNX2_ISCSI is not set 690# CONFIG_SCSI_BNX2_ISCSI is not set
647# CONFIG_BE2ISCSI is not set 691# CONFIG_BE2ISCSI is not set
648# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 692# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
693# CONFIG_SCSI_HPSA is not set
649# CONFIG_SCSI_3W_9XXX is not set 694# CONFIG_SCSI_3W_9XXX is not set
695# CONFIG_SCSI_3W_SAS is not set
650# CONFIG_SCSI_ACARD is not set 696# CONFIG_SCSI_ACARD is not set
651# CONFIG_SCSI_AACRAID is not set 697# CONFIG_SCSI_AACRAID is not set
652# CONFIG_SCSI_AIC7XXX is not set 698# CONFIG_SCSI_AIC7XXX is not set
@@ -685,6 +731,7 @@ CONFIG_SCSI_LOWLEVEL=y
685# CONFIG_SCSI_NSP32 is not set 731# CONFIG_SCSI_NSP32 is not set
686# CONFIG_SCSI_DEBUG is not set 732# CONFIG_SCSI_DEBUG is not set
687# CONFIG_SCSI_PMCRAID is not set 733# CONFIG_SCSI_PMCRAID is not set
734# CONFIG_SCSI_PM8001 is not set
688# CONFIG_SCSI_SRP is not set 735# CONFIG_SCSI_SRP is not set
689# CONFIG_SCSI_BFA_FC is not set 736# CONFIG_SCSI_BFA_FC is not set
690# CONFIG_SCSI_DH is not set 737# CONFIG_SCSI_DH is not set
@@ -740,15 +787,16 @@ CONFIG_PATA_ALI=y
740# CONFIG_PATA_NS87415 is not set 787# CONFIG_PATA_NS87415 is not set
741# CONFIG_PATA_OPTI is not set 788# CONFIG_PATA_OPTI is not set
742# CONFIG_PATA_OPTIDMA is not set 789# CONFIG_PATA_OPTIDMA is not set
790# CONFIG_PATA_PDC2027X is not set
743# CONFIG_PATA_PDC_OLD is not set 791# CONFIG_PATA_PDC_OLD is not set
744# CONFIG_PATA_RADISYS is not set 792# CONFIG_PATA_RADISYS is not set
745# CONFIG_PATA_RDC is not set 793# CONFIG_PATA_RDC is not set
746# CONFIG_PATA_RZ1000 is not set 794# CONFIG_PATA_RZ1000 is not set
747# CONFIG_PATA_SC1200 is not set 795# CONFIG_PATA_SC1200 is not set
748# CONFIG_PATA_SERVERWORKS is not set 796# CONFIG_PATA_SERVERWORKS is not set
749# CONFIG_PATA_PDC2027X is not set
750# CONFIG_PATA_SIL680 is not set 797# CONFIG_PATA_SIL680 is not set
751# CONFIG_PATA_SIS is not set 798# CONFIG_PATA_SIS is not set
799# CONFIG_PATA_TOSHIBA is not set
752# CONFIG_PATA_VIA is not set 800# CONFIG_PATA_VIA is not set
753# CONFIG_PATA_WINBOND is not set 801# CONFIG_PATA_WINBOND is not set
754# CONFIG_PATA_PLATFORM is not set 802# CONFIG_PATA_PLATFORM is not set
@@ -765,7 +813,7 @@ CONFIG_PATA_ALI=y
765# 813#
766 814
767# 815#
768# See the help texts for more information. 816# The newer stack is recommended.
769# 817#
770# CONFIG_FIREWIRE is not set 818# CONFIG_FIREWIRE is not set
771# CONFIG_IEEE1394 is not set 819# CONFIG_IEEE1394 is not set
@@ -852,8 +900,11 @@ CONFIG_GIANFAR=y
852# CONFIG_NETDEV_10000 is not set 900# CONFIG_NETDEV_10000 is not set
853# CONFIG_TR is not set 901# CONFIG_TR is not set
854CONFIG_WLAN=y 902CONFIG_WLAN=y
855# CONFIG_WLAN_PRE80211 is not set 903# CONFIG_AIRO is not set
856# CONFIG_WLAN_80211 is not set 904# CONFIG_ATMEL is not set
905# CONFIG_PRISM54 is not set
906# CONFIG_USB_ZD1201 is not set
907# CONFIG_HOSTAP is not set
857 908
858# 909#
859# Enable WiMAX (Networking options) to see the WiMAX drivers 910# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -876,6 +927,7 @@ CONFIG_WLAN=y
876# CONFIG_NETCONSOLE is not set 927# CONFIG_NETCONSOLE is not set
877# CONFIG_NETPOLL is not set 928# CONFIG_NETPOLL is not set
878# CONFIG_NET_POLL_CONTROLLER is not set 929# CONFIG_NET_POLL_CONTROLLER is not set
930# CONFIG_VMXNET3 is not set
879# CONFIG_ISDN is not set 931# CONFIG_ISDN is not set
880# CONFIG_PHONE is not set 932# CONFIG_PHONE is not set
881 933
@@ -885,6 +937,7 @@ CONFIG_WLAN=y
885CONFIG_INPUT=y 937CONFIG_INPUT=y
886# CONFIG_INPUT_FF_MEMLESS is not set 938# CONFIG_INPUT_FF_MEMLESS is not set
887# CONFIG_INPUT_POLLDEV is not set 939# CONFIG_INPUT_POLLDEV is not set
940# CONFIG_INPUT_SPARSEKMAP is not set
888 941
889# 942#
890# Userland interfaces 943# Userland interfaces
@@ -914,6 +967,7 @@ CONFIG_SERIO_SERPORT=y
914CONFIG_SERIO_LIBPS2=y 967CONFIG_SERIO_LIBPS2=y
915# CONFIG_SERIO_RAW is not set 968# CONFIG_SERIO_RAW is not set
916# CONFIG_SERIO_XILINX_XPS_PS2 is not set 969# CONFIG_SERIO_XILINX_XPS_PS2 is not set
970# CONFIG_SERIO_ALTERA_PS2 is not set
917# CONFIG_GAMEPORT is not set 971# CONFIG_GAMEPORT is not set
918 972
919# 973#
@@ -950,6 +1004,7 @@ CONFIG_SERIAL_CORE=y
950CONFIG_SERIAL_CORE_CONSOLE=y 1004CONFIG_SERIAL_CORE_CONSOLE=y
951# CONFIG_SERIAL_JSM is not set 1005# CONFIG_SERIAL_JSM is not set
952# CONFIG_SERIAL_OF_PLATFORM is not set 1006# CONFIG_SERIAL_OF_PLATFORM is not set
1007# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
953CONFIG_UNIX98_PTYS=y 1008CONFIG_UNIX98_PTYS=y
954# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1009# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
955CONFIG_LEGACY_PTYS=y 1010CONFIG_LEGACY_PTYS=y
@@ -1007,11 +1062,6 @@ CONFIG_I2C_MPC=y
1007# CONFIG_I2C_TINY_USB is not set 1062# CONFIG_I2C_TINY_USB is not set
1008 1063
1009# 1064#
1010# Graphics adapter I2C/DDC channel drivers
1011#
1012# CONFIG_I2C_VOODOO3 is not set
1013
1014#
1015# Other I2C/SMBus bus drivers 1065# Other I2C/SMBus bus drivers
1016# 1066#
1017# CONFIG_I2C_PCA_PLATFORM is not set 1067# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1020,7 +1070,6 @@ CONFIG_I2C_MPC=y
1020# 1070#
1021# Miscellaneous I2C Chip support 1071# Miscellaneous I2C Chip support
1022# 1072#
1023# CONFIG_DS1682 is not set
1024# CONFIG_SENSORS_TSL2550 is not set 1073# CONFIG_SENSORS_TSL2550 is not set
1025# CONFIG_I2C_DEBUG_CORE is not set 1074# CONFIG_I2C_DEBUG_CORE is not set
1026# CONFIG_I2C_DEBUG_ALGO is not set 1075# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1053,6 +1102,7 @@ CONFIG_GPIO_PCA953X=y
1053# 1102#
1054# PCI GPIO expanders: 1103# PCI GPIO expanders:
1055# 1104#
1105# CONFIG_GPIO_CS5535 is not set
1056# CONFIG_GPIO_BT8XX is not set 1106# CONFIG_GPIO_BT8XX is not set
1057# CONFIG_GPIO_LANGWELL is not set 1107# CONFIG_GPIO_LANGWELL is not set
1058 1108
@@ -1095,6 +1145,7 @@ CONFIG_SENSORS_DS1621=y
1095# CONFIG_SENSORS_GL520SM is not set 1145# CONFIG_SENSORS_GL520SM is not set
1096# CONFIG_SENSORS_IT87 is not set 1146# CONFIG_SENSORS_IT87 is not set
1097# CONFIG_SENSORS_LM63 is not set 1147# CONFIG_SENSORS_LM63 is not set
1148# CONFIG_SENSORS_LM73 is not set
1098# CONFIG_SENSORS_LM75 is not set 1149# CONFIG_SENSORS_LM75 is not set
1099# CONFIG_SENSORS_LM77 is not set 1150# CONFIG_SENSORS_LM77 is not set
1100# CONFIG_SENSORS_LM78 is not set 1151# CONFIG_SENSORS_LM78 is not set
@@ -1134,6 +1185,7 @@ CONFIG_SENSORS_LM90=y
1134# CONFIG_SENSORS_W83L786NG is not set 1185# CONFIG_SENSORS_W83L786NG is not set
1135# CONFIG_SENSORS_W83627HF is not set 1186# CONFIG_SENSORS_W83627HF is not set
1136# CONFIG_SENSORS_W83627EHF is not set 1187# CONFIG_SENSORS_W83627EHF is not set
1188# CONFIG_SENSORS_LIS3_I2C is not set
1137# CONFIG_THERMAL is not set 1189# CONFIG_THERMAL is not set
1138CONFIG_WATCHDOG=y 1190CONFIG_WATCHDOG=y
1139# CONFIG_WATCHDOG_NOWAYOUT is not set 1191# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1172,11 +1224,13 @@ CONFIG_SSB_POSSIBLE=y
1172# CONFIG_TWL4030_CORE is not set 1224# CONFIG_TWL4030_CORE is not set
1173# CONFIG_MFD_TMIO is not set 1225# CONFIG_MFD_TMIO is not set
1174# CONFIG_PMIC_DA903X is not set 1226# CONFIG_PMIC_DA903X is not set
1227# CONFIG_PMIC_ADP5520 is not set
1175# CONFIG_MFD_WM8400 is not set 1228# CONFIG_MFD_WM8400 is not set
1176# CONFIG_MFD_WM831X is not set 1229# CONFIG_MFD_WM831X is not set
1177# CONFIG_MFD_WM8350_I2C is not set 1230# CONFIG_MFD_WM8350_I2C is not set
1178# CONFIG_MFD_PCF50633 is not set 1231# CONFIG_MFD_PCF50633 is not set
1179# CONFIG_AB3100_CORE is not set 1232# CONFIG_AB3100_CORE is not set
1233# CONFIG_MFD_88PM8607 is not set
1180# CONFIG_REGULATOR is not set 1234# CONFIG_REGULATOR is not set
1181# CONFIG_MEDIA_SUPPORT is not set 1235# CONFIG_MEDIA_SUPPORT is not set
1182 1236
@@ -1368,6 +1422,7 @@ CONFIG_LEDS_GPIO_OF=y
1368# CONFIG_LEDS_LP3944 is not set 1422# CONFIG_LEDS_LP3944 is not set
1369CONFIG_LEDS_PCA955X=y 1423CONFIG_LEDS_PCA955X=y
1370# CONFIG_LEDS_BD2802 is not set 1424# CONFIG_LEDS_BD2802 is not set
1425# CONFIG_LEDS_LT3593 is not set
1371 1426
1372# 1427#
1373# LED Triggers 1428# LED Triggers
@@ -1391,7 +1446,6 @@ CONFIG_EDAC=y
1391# 1446#
1392# CONFIG_EDAC_DEBUG is not set 1447# CONFIG_EDAC_DEBUG is not set
1393CONFIG_EDAC_MM_EDAC=y 1448CONFIG_EDAC_MM_EDAC=y
1394CONFIG_EDAC_MPC85XX=y
1395CONFIG_RTC_LIB=y 1449CONFIG_RTC_LIB=y
1396CONFIG_RTC_CLASS=y 1450CONFIG_RTC_CLASS=y
1397CONFIG_RTC_HCTOSYS=y 1451CONFIG_RTC_HCTOSYS=y
@@ -1420,6 +1474,7 @@ CONFIG_RTC_DRV_DS1307=y
1420# CONFIG_RTC_DRV_PCF8563 is not set 1474# CONFIG_RTC_DRV_PCF8563 is not set
1421# CONFIG_RTC_DRV_PCF8583 is not set 1475# CONFIG_RTC_DRV_PCF8583 is not set
1422# CONFIG_RTC_DRV_M41T80 is not set 1476# CONFIG_RTC_DRV_M41T80 is not set
1477# CONFIG_RTC_DRV_BQ32K is not set
1423# CONFIG_RTC_DRV_S35390A is not set 1478# CONFIG_RTC_DRV_S35390A is not set
1424# CONFIG_RTC_DRV_FM3130 is not set 1479# CONFIG_RTC_DRV_FM3130 is not set
1425# CONFIG_RTC_DRV_RX8581 is not set 1480# CONFIG_RTC_DRV_RX8581 is not set
@@ -1441,7 +1496,9 @@ CONFIG_RTC_DRV_CMOS=y
1441# CONFIG_RTC_DRV_M48T86 is not set 1496# CONFIG_RTC_DRV_M48T86 is not set
1442# CONFIG_RTC_DRV_M48T35 is not set 1497# CONFIG_RTC_DRV_M48T35 is not set
1443# CONFIG_RTC_DRV_M48T59 is not set 1498# CONFIG_RTC_DRV_M48T59 is not set
1499# CONFIG_RTC_DRV_MSM6242 is not set
1444# CONFIG_RTC_DRV_BQ4802 is not set 1500# CONFIG_RTC_DRV_BQ4802 is not set
1501# CONFIG_RTC_DRV_RP5C01 is not set
1445# CONFIG_RTC_DRV_V3020 is not set 1502# CONFIG_RTC_DRV_V3020 is not set
1446 1503
1447# 1504#
@@ -1772,7 +1829,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1772# CONFIG_KEYS is not set 1829# CONFIG_KEYS is not set
1773# CONFIG_SECURITY is not set 1830# CONFIG_SECURITY is not set
1774# CONFIG_SECURITYFS is not set 1831# CONFIG_SECURITYFS is not set
1775# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1832# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1833# CONFIG_DEFAULT_SECURITY_SMACK is not set
1834# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1835CONFIG_DEFAULT_SECURITY_DAC=y
1836CONFIG_DEFAULT_SECURITY=""
1776CONFIG_CRYPTO=y 1837CONFIG_CRYPTO=y
1777 1838
1778# 1839#
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
index 6cd2cd65c2cd..a85f927bf225 100644
--- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
+++ b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:49 2009 4# Wed Jan 6 09:24:43 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +94,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
91# 94#
92CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
93# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
94# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -181,14 +185,41 @@ CONFIG_LBDAF=y
181# IO Schedulers 185# IO Schedulers
182# 186#
183CONFIG_IOSCHED_NOOP=y 187CONFIG_IOSCHED_NOOP=y
184CONFIG_IOSCHED_AS=y
185CONFIG_IOSCHED_DEADLINE=y 188CONFIG_IOSCHED_DEADLINE=y
186CONFIG_IOSCHED_CFQ=y 189CONFIG_IOSCHED_CFQ=y
187# CONFIG_DEFAULT_AS is not set
188# CONFIG_DEFAULT_DEADLINE is not set 190# CONFIG_DEFAULT_DEADLINE is not set
189CONFIG_DEFAULT_CFQ=y 191CONFIG_DEFAULT_CFQ=y
190# CONFIG_DEFAULT_NOOP is not set 192# CONFIG_DEFAULT_NOOP is not set
191CONFIG_DEFAULT_IOSCHED="cfq" 193CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_INLINE_SPIN_TRYLOCK is not set
195# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
196# CONFIG_INLINE_SPIN_LOCK is not set
197# CONFIG_INLINE_SPIN_LOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
200# CONFIG_INLINE_SPIN_UNLOCK is not set
201# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
202# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
203# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_READ_TRYLOCK is not set
205# CONFIG_INLINE_READ_LOCK is not set
206# CONFIG_INLINE_READ_LOCK_BH is not set
207# CONFIG_INLINE_READ_LOCK_IRQ is not set
208# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
209# CONFIG_INLINE_READ_UNLOCK is not set
210# CONFIG_INLINE_READ_UNLOCK_BH is not set
211# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
212# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
213# CONFIG_INLINE_WRITE_TRYLOCK is not set
214# CONFIG_INLINE_WRITE_LOCK is not set
215# CONFIG_INLINE_WRITE_LOCK_BH is not set
216# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
218# CONFIG_INLINE_WRITE_UNLOCK is not set
219# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
220# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
221# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
222CONFIG_MUTEX_SPIN_ON_OWNER=y
192# CONFIG_FREEZER is not set 223# CONFIG_FREEZER is not set
193 224
194# 225#
@@ -259,6 +290,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
261CONFIG_IRQ_ALL_CPUS=y 292CONFIG_IRQ_ALL_CPUS=y
293CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +307,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 310# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -314,7 +344,6 @@ CONFIG_ARCH_SUPPORTS_MSI=y
314# CONFIG_PCI_STUB is not set 344# CONFIG_PCI_STUB is not set
315# CONFIG_PCI_IOV is not set 345# CONFIG_PCI_IOV is not set
316CONFIG_PCCARD=y 346CONFIG_PCCARD=y
317# CONFIG_PCMCIA_DEBUG is not set
318CONFIG_PCMCIA=y 347CONFIG_PCMCIA=y
319# CONFIG_PCMCIA_LOAD_CIS is not set 348# CONFIG_PCMCIA_LOAD_CIS is not set
320# CONFIG_PCMCIA_IOCTL is not set 349# CONFIG_PCMCIA_IOCTL is not set
@@ -414,6 +443,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
414CONFIG_INET6_XFRM_MODE_BEET=m 443CONFIG_INET6_XFRM_MODE_BEET=m
415# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 444# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
416CONFIG_IPV6_SIT=m 445CONFIG_IPV6_SIT=m
446# CONFIG_IPV6_SIT_6RD is not set
417CONFIG_IPV6_NDISC_NODETYPE=y 447CONFIG_IPV6_NDISC_NODETYPE=y
418CONFIG_IPV6_TUNNEL=m 448CONFIG_IPV6_TUNNEL=m
419# CONFIG_IPV6_MULTIPLE_TABLES is not set 449# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -451,7 +481,13 @@ CONFIG_NET_PKTGEN=m
451# CONFIG_BT is not set 481# CONFIG_BT is not set
452# CONFIG_AF_RXRPC is not set 482# CONFIG_AF_RXRPC is not set
453CONFIG_FIB_RULES=y 483CONFIG_FIB_RULES=y
454# CONFIG_WIRELESS is not set 484CONFIG_WIRELESS=y
485# CONFIG_CFG80211 is not set
486# CONFIG_LIB80211 is not set
487
488#
489# CFG80211 needs to be enabled for MAC80211
490#
455# CONFIG_WIMAX is not set 491# CONFIG_WIMAX is not set
456# CONFIG_RFKILL is not set 492# CONFIG_RFKILL is not set
457# CONFIG_NET_9P is not set 493# CONFIG_NET_9P is not set
@@ -570,6 +606,10 @@ CONFIG_BLK_DEV=y
570# CONFIG_BLK_DEV_COW_COMMON is not set 606# CONFIG_BLK_DEV_COW_COMMON is not set
571CONFIG_BLK_DEV_LOOP=m 607CONFIG_BLK_DEV_LOOP=m
572CONFIG_BLK_DEV_CRYPTOLOOP=m 608CONFIG_BLK_DEV_CRYPTOLOOP=m
609
610#
611# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
612#
573CONFIG_BLK_DEV_NBD=m 613CONFIG_BLK_DEV_NBD=m
574# CONFIG_BLK_DEV_SX8 is not set 614# CONFIG_BLK_DEV_SX8 is not set
575# CONFIG_BLK_DEV_UB is not set 615# CONFIG_BLK_DEV_UB is not set
@@ -581,6 +621,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
581# CONFIG_ATA_OVER_ETH is not set 621# CONFIG_ATA_OVER_ETH is not set
582# CONFIG_BLK_DEV_HD is not set 622# CONFIG_BLK_DEV_HD is not set
583CONFIG_MISC_DEVICES=y 623CONFIG_MISC_DEVICES=y
624# CONFIG_AD525X_DPOT is not set
584# CONFIG_PHANTOM is not set 625# CONFIG_PHANTOM is not set
585# CONFIG_SGI_IOC4 is not set 626# CONFIG_SGI_IOC4 is not set
586# CONFIG_TIFM_CORE is not set 627# CONFIG_TIFM_CORE is not set
@@ -588,6 +629,7 @@ CONFIG_MISC_DEVICES=y
588# CONFIG_ENCLOSURE_SERVICES is not set 629# CONFIG_ENCLOSURE_SERVICES is not set
589# CONFIG_HP_ILO is not set 630# CONFIG_HP_ILO is not set
590# CONFIG_ISL29003 is not set 631# CONFIG_ISL29003 is not set
632CONFIG_DS1682=y
591# CONFIG_C2PORT is not set 633# CONFIG_C2PORT is not set
592 634
593# 635#
@@ -689,7 +731,9 @@ CONFIG_SCSI_LOWLEVEL=y
689# CONFIG_SCSI_BNX2_ISCSI is not set 731# CONFIG_SCSI_BNX2_ISCSI is not set
690# CONFIG_BE2ISCSI is not set 732# CONFIG_BE2ISCSI is not set
691# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 733# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
734# CONFIG_SCSI_HPSA is not set
692# CONFIG_SCSI_3W_9XXX is not set 735# CONFIG_SCSI_3W_9XXX is not set
736# CONFIG_SCSI_3W_SAS is not set
693# CONFIG_SCSI_ACARD is not set 737# CONFIG_SCSI_ACARD is not set
694# CONFIG_SCSI_AACRAID is not set 738# CONFIG_SCSI_AACRAID is not set
695# CONFIG_SCSI_AIC7XXX is not set 739# CONFIG_SCSI_AIC7XXX is not set
@@ -728,6 +772,7 @@ CONFIG_SCSI_LOWLEVEL=y
728# CONFIG_SCSI_NSP32 is not set 772# CONFIG_SCSI_NSP32 is not set
729# CONFIG_SCSI_DEBUG is not set 773# CONFIG_SCSI_DEBUG is not set
730# CONFIG_SCSI_PMCRAID is not set 774# CONFIG_SCSI_PMCRAID is not set
775# CONFIG_SCSI_PM8001 is not set
731# CONFIG_SCSI_SRP is not set 776# CONFIG_SCSI_SRP is not set
732# CONFIG_SCSI_BFA_FC is not set 777# CONFIG_SCSI_BFA_FC is not set
733# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 778# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -785,15 +830,16 @@ CONFIG_SATA_SIL=y
785# CONFIG_PATA_OPTI is not set 830# CONFIG_PATA_OPTI is not set
786# CONFIG_PATA_OPTIDMA is not set 831# CONFIG_PATA_OPTIDMA is not set
787# CONFIG_PATA_PCMCIA is not set 832# CONFIG_PATA_PCMCIA is not set
833# CONFIG_PATA_PDC2027X is not set
788# CONFIG_PATA_PDC_OLD is not set 834# CONFIG_PATA_PDC_OLD is not set
789# CONFIG_PATA_RADISYS is not set 835# CONFIG_PATA_RADISYS is not set
790# CONFIG_PATA_RDC is not set 836# CONFIG_PATA_RDC is not set
791# CONFIG_PATA_RZ1000 is not set 837# CONFIG_PATA_RZ1000 is not set
792# CONFIG_PATA_SC1200 is not set 838# CONFIG_PATA_SC1200 is not set
793# CONFIG_PATA_SERVERWORKS is not set 839# CONFIG_PATA_SERVERWORKS is not set
794# CONFIG_PATA_PDC2027X is not set
795# CONFIG_PATA_SIL680 is not set 840# CONFIG_PATA_SIL680 is not set
796# CONFIG_PATA_SIS is not set 841# CONFIG_PATA_SIS is not set
842# CONFIG_PATA_TOSHIBA is not set
797# CONFIG_PATA_VIA is not set 843# CONFIG_PATA_VIA is not set
798# CONFIG_PATA_WINBOND is not set 844# CONFIG_PATA_WINBOND is not set
799# CONFIG_PATA_PLATFORM is not set 845# CONFIG_PATA_PLATFORM is not set
@@ -810,7 +856,7 @@ CONFIG_SATA_SIL=y
810# 856#
811 857
812# 858#
813# See the help texts for more information. 859# The newer stack is recommended.
814# 860#
815# CONFIG_FIREWIRE is not set 861# CONFIG_FIREWIRE is not set
816# CONFIG_IEEE1394 is not set 862# CONFIG_IEEE1394 is not set
@@ -897,8 +943,14 @@ CONFIG_GIANFAR=y
897# CONFIG_NETDEV_10000 is not set 943# CONFIG_NETDEV_10000 is not set
898# CONFIG_TR is not set 944# CONFIG_TR is not set
899CONFIG_WLAN=y 945CONFIG_WLAN=y
900# CONFIG_WLAN_PRE80211 is not set 946# CONFIG_PCMCIA_RAYCS is not set
901# CONFIG_WLAN_80211 is not set 947# CONFIG_AIRO is not set
948# CONFIG_ATMEL is not set
949# CONFIG_AIRO_CS is not set
950# CONFIG_PCMCIA_WL3501 is not set
951# CONFIG_PRISM54 is not set
952# CONFIG_USB_ZD1201 is not set
953# CONFIG_HOSTAP is not set
902 954
903# 955#
904# Enable WiMAX (Networking options) to see the WiMAX drivers 956# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -937,6 +989,7 @@ CONFIG_NETCONSOLE=y
937CONFIG_NETPOLL=y 989CONFIG_NETPOLL=y
938CONFIG_NETPOLL_TRAP=y 990CONFIG_NETPOLL_TRAP=y
939CONFIG_NET_POLL_CONTROLLER=y 991CONFIG_NET_POLL_CONTROLLER=y
992# CONFIG_VMXNET3 is not set
940# CONFIG_ISDN is not set 993# CONFIG_ISDN is not set
941# CONFIG_PHONE is not set 994# CONFIG_PHONE is not set
942 995
@@ -946,6 +999,7 @@ CONFIG_NET_POLL_CONTROLLER=y
946CONFIG_INPUT=y 999CONFIG_INPUT=y
947# CONFIG_INPUT_FF_MEMLESS is not set 1000# CONFIG_INPUT_FF_MEMLESS is not set
948# CONFIG_INPUT_POLLDEV is not set 1001# CONFIG_INPUT_POLLDEV is not set
1002# CONFIG_INPUT_SPARSEKMAP is not set
949 1003
950# 1004#
951# Userland interfaces 1005# Userland interfaces
@@ -1005,6 +1059,7 @@ CONFIG_SERIAL_CORE=y
1005CONFIG_SERIAL_CORE_CONSOLE=y 1059CONFIG_SERIAL_CORE_CONSOLE=y
1006# CONFIG_SERIAL_JSM is not set 1060# CONFIG_SERIAL_JSM is not set
1007# CONFIG_SERIAL_OF_PLATFORM is not set 1061# CONFIG_SERIAL_OF_PLATFORM is not set
1062# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
1008CONFIG_UNIX98_PTYS=y 1063CONFIG_UNIX98_PTYS=y
1009# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1064# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1010# CONFIG_LEGACY_PTYS is not set 1065# CONFIG_LEGACY_PTYS is not set
@@ -1070,11 +1125,6 @@ CONFIG_I2C_MPC=y
1070# CONFIG_I2C_TINY_USB is not set 1125# CONFIG_I2C_TINY_USB is not set
1071 1126
1072# 1127#
1073# Graphics adapter I2C/DDC channel drivers
1074#
1075# CONFIG_I2C_VOODOO3 is not set
1076
1077#
1078# Other I2C/SMBus bus drivers 1128# Other I2C/SMBus bus drivers
1079# 1129#
1080# CONFIG_I2C_PCA_PLATFORM is not set 1130# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1083,7 +1133,6 @@ CONFIG_I2C_MPC=y
1083# 1133#
1084# Miscellaneous I2C Chip support 1134# Miscellaneous I2C Chip support
1085# 1135#
1086CONFIG_DS1682=y
1087# CONFIG_SENSORS_TSL2550 is not set 1136# CONFIG_SENSORS_TSL2550 is not set
1088# CONFIG_I2C_DEBUG_CORE is not set 1137# CONFIG_I2C_DEBUG_CORE is not set
1089# CONFIG_I2C_DEBUG_ALGO is not set 1138# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1115,6 +1164,7 @@ CONFIG_GPIO_SYSFS=y
1115# 1164#
1116# PCI GPIO expanders: 1165# PCI GPIO expanders:
1117# 1166#
1167# CONFIG_GPIO_CS5535 is not set
1118# CONFIG_GPIO_BT8XX is not set 1168# CONFIG_GPIO_BT8XX is not set
1119# CONFIG_GPIO_LANGWELL is not set 1169# CONFIG_GPIO_LANGWELL is not set
1120 1170
@@ -1157,6 +1207,7 @@ CONFIG_HWMON=y
1157# CONFIG_SENSORS_GL520SM is not set 1207# CONFIG_SENSORS_GL520SM is not set
1158# CONFIG_SENSORS_IT87 is not set 1208# CONFIG_SENSORS_IT87 is not set
1159# CONFIG_SENSORS_LM63 is not set 1209# CONFIG_SENSORS_LM63 is not set
1210# CONFIG_SENSORS_LM73 is not set
1160# CONFIG_SENSORS_LM75 is not set 1211# CONFIG_SENSORS_LM75 is not set
1161# CONFIG_SENSORS_LM77 is not set 1212# CONFIG_SENSORS_LM77 is not set
1162# CONFIG_SENSORS_LM78 is not set 1213# CONFIG_SENSORS_LM78 is not set
@@ -1196,6 +1247,7 @@ CONFIG_SENSORS_LM92=y
1196# CONFIG_SENSORS_W83L786NG is not set 1247# CONFIG_SENSORS_W83L786NG is not set
1197# CONFIG_SENSORS_W83627HF is not set 1248# CONFIG_SENSORS_W83627HF is not set
1198# CONFIG_SENSORS_W83627EHF is not set 1249# CONFIG_SENSORS_W83627EHF is not set
1250# CONFIG_SENSORS_LIS3_I2C is not set
1199# CONFIG_THERMAL is not set 1251# CONFIG_THERMAL is not set
1200CONFIG_WATCHDOG=y 1252CONFIG_WATCHDOG=y
1201# CONFIG_WATCHDOG_NOWAYOUT is not set 1253# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1235,11 +1287,13 @@ CONFIG_SSB_POSSIBLE=y
1235# CONFIG_TWL4030_CORE is not set 1287# CONFIG_TWL4030_CORE is not set
1236# CONFIG_MFD_TMIO is not set 1288# CONFIG_MFD_TMIO is not set
1237# CONFIG_PMIC_DA903X is not set 1289# CONFIG_PMIC_DA903X is not set
1290# CONFIG_PMIC_ADP5520 is not set
1238# CONFIG_MFD_WM8400 is not set 1291# CONFIG_MFD_WM8400 is not set
1239# CONFIG_MFD_WM831X is not set 1292# CONFIG_MFD_WM831X is not set
1240# CONFIG_MFD_WM8350_I2C is not set 1293# CONFIG_MFD_WM8350_I2C is not set
1241# CONFIG_MFD_PCF50633 is not set 1294# CONFIG_MFD_PCF50633 is not set
1242# CONFIG_AB3100_CORE is not set 1295# CONFIG_AB3100_CORE is not set
1296# CONFIG_MFD_88PM8607 is not set
1243# CONFIG_REGULATOR is not set 1297# CONFIG_REGULATOR is not set
1244# CONFIG_MEDIA_SUPPORT is not set 1298# CONFIG_MEDIA_SUPPORT is not set
1245 1299
@@ -1338,6 +1392,7 @@ CONFIG_USB=y
1338CONFIG_USB_EHCI_HCD=y 1392CONFIG_USB_EHCI_HCD=y
1339# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1393# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1340# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1394# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1395# CONFIG_XPS_USB_HCD_XILINX is not set
1341# CONFIG_USB_EHCI_FSL is not set 1396# CONFIG_USB_EHCI_FSL is not set
1342# CONFIG_USB_EHCI_HCD_PPC_OF is not set 1397# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1343# CONFIG_USB_OXU210HP_HCD is not set 1398# CONFIG_USB_OXU210HP_HCD is not set
@@ -1464,6 +1519,7 @@ CONFIG_RTC_INTF_DEV=y
1464# CONFIG_RTC_DRV_PCF8563 is not set 1519# CONFIG_RTC_DRV_PCF8563 is not set
1465# CONFIG_RTC_DRV_PCF8583 is not set 1520# CONFIG_RTC_DRV_PCF8583 is not set
1466# CONFIG_RTC_DRV_M41T80 is not set 1521# CONFIG_RTC_DRV_M41T80 is not set
1522# CONFIG_RTC_DRV_BQ32K is not set
1467# CONFIG_RTC_DRV_S35390A is not set 1523# CONFIG_RTC_DRV_S35390A is not set
1468# CONFIG_RTC_DRV_FM3130 is not set 1524# CONFIG_RTC_DRV_FM3130 is not set
1469CONFIG_RTC_DRV_RX8581=y 1525CONFIG_RTC_DRV_RX8581=y
@@ -1485,7 +1541,9 @@ CONFIG_RTC_DRV_RX8581=y
1485# CONFIG_RTC_DRV_M48T86 is not set 1541# CONFIG_RTC_DRV_M48T86 is not set
1486# CONFIG_RTC_DRV_M48T35 is not set 1542# CONFIG_RTC_DRV_M48T35 is not set
1487# CONFIG_RTC_DRV_M48T59 is not set 1543# CONFIG_RTC_DRV_M48T59 is not set
1544# CONFIG_RTC_DRV_MSM6242 is not set
1488# CONFIG_RTC_DRV_BQ4802 is not set 1545# CONFIG_RTC_DRV_BQ4802 is not set
1546# CONFIG_RTC_DRV_RP5C01 is not set
1489# CONFIG_RTC_DRV_V3020 is not set 1547# CONFIG_RTC_DRV_V3020 is not set
1490 1548
1491# 1549#
@@ -1710,7 +1768,7 @@ CONFIG_MAGIC_SYSRQ=y
1710# CONFIG_DEBUG_FS is not set 1768# CONFIG_DEBUG_FS is not set
1711# CONFIG_HEADERS_CHECK is not set 1769# CONFIG_HEADERS_CHECK is not set
1712# CONFIG_DEBUG_KERNEL is not set 1770# CONFIG_DEBUG_KERNEL is not set
1713# CONFIG_DEBUG_BUGVERBOSE is not set 1771CONFIG_DEBUG_BUGVERBOSE=y
1714# CONFIG_DEBUG_MEMORY_INIT is not set 1772# CONFIG_DEBUG_MEMORY_INIT is not set
1715# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1773# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1716# CONFIG_LATENCYTOP is not set 1774# CONFIG_LATENCYTOP is not set
@@ -1737,7 +1795,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1737# CONFIG_KEYS is not set 1795# CONFIG_KEYS is not set
1738# CONFIG_SECURITY is not set 1796# CONFIG_SECURITY is not set
1739# CONFIG_SECURITYFS is not set 1797# CONFIG_SECURITYFS is not set
1740# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1798# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1799# CONFIG_DEFAULT_SECURITY_SMACK is not set
1800# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1801CONFIG_DEFAULT_SECURITY_DAC=y
1802CONFIG_DEFAULT_SECURITY=""
1741CONFIG_CRYPTO=y 1803CONFIG_CRYPTO=y
1742 1804
1743# 1805#
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
index a6a3768f7304..eb58dec11a61 100644
--- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:47 2009 4# Wed Jan 6 09:24:41 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +94,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
91# 94#
92CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
93# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
94# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -181,14 +185,41 @@ CONFIG_LBDAF=y
181# IO Schedulers 185# IO Schedulers
182# 186#
183CONFIG_IOSCHED_NOOP=y 187CONFIG_IOSCHED_NOOP=y
184CONFIG_IOSCHED_AS=y
185CONFIG_IOSCHED_DEADLINE=y 188CONFIG_IOSCHED_DEADLINE=y
186CONFIG_IOSCHED_CFQ=y 189CONFIG_IOSCHED_CFQ=y
187# CONFIG_DEFAULT_AS is not set
188# CONFIG_DEFAULT_DEADLINE is not set 190# CONFIG_DEFAULT_DEADLINE is not set
189CONFIG_DEFAULT_CFQ=y 191CONFIG_DEFAULT_CFQ=y
190# CONFIG_DEFAULT_NOOP is not set 192# CONFIG_DEFAULT_NOOP is not set
191CONFIG_DEFAULT_IOSCHED="cfq" 193CONFIG_DEFAULT_IOSCHED="cfq"
194# CONFIG_INLINE_SPIN_TRYLOCK is not set
195# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
196# CONFIG_INLINE_SPIN_LOCK is not set
197# CONFIG_INLINE_SPIN_LOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
200# CONFIG_INLINE_SPIN_UNLOCK is not set
201# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
202# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
203# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
204# CONFIG_INLINE_READ_TRYLOCK is not set
205# CONFIG_INLINE_READ_LOCK is not set
206# CONFIG_INLINE_READ_LOCK_BH is not set
207# CONFIG_INLINE_READ_LOCK_IRQ is not set
208# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
209# CONFIG_INLINE_READ_UNLOCK is not set
210# CONFIG_INLINE_READ_UNLOCK_BH is not set
211# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
212# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
213# CONFIG_INLINE_WRITE_TRYLOCK is not set
214# CONFIG_INLINE_WRITE_LOCK is not set
215# CONFIG_INLINE_WRITE_LOCK_BH is not set
216# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
218# CONFIG_INLINE_WRITE_UNLOCK is not set
219# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
220# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
221# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
222CONFIG_MUTEX_SPIN_ON_OWNER=y
192# CONFIG_FREEZER is not set 223# CONFIG_FREEZER is not set
193 224
194# 225#
@@ -259,6 +290,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259# CONFIG_KEXEC is not set 290# CONFIG_KEXEC is not set
260# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
261CONFIG_IRQ_ALL_CPUS=y 292CONFIG_IRQ_ALL_CPUS=y
293CONFIG_SPARSE_IRQ=y
262CONFIG_MAX_ACTIVE_REGIONS=32 294CONFIG_MAX_ACTIVE_REGIONS=32
263CONFIG_ARCH_FLATMEM_ENABLE=y 295CONFIG_ARCH_FLATMEM_ENABLE=y
264CONFIG_ARCH_POPULATES_NODE_MAP=y 296CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -275,8 +307,6 @@ CONFIG_MIGRATION=y
275CONFIG_ZONE_DMA_FLAG=1 307CONFIG_ZONE_DMA_FLAG=1
276CONFIG_BOUNCE=y 308CONFIG_BOUNCE=y
277CONFIG_VIRT_TO_BUS=y 309CONFIG_VIRT_TO_BUS=y
278CONFIG_HAVE_MLOCK=y
279CONFIG_HAVE_MLOCKED_PAGE_BIT=y
280# CONFIG_KSM is not set 310# CONFIG_KSM is not set
281CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 311CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
282CONFIG_PPC_4K_PAGES=y 312CONFIG_PPC_4K_PAGES=y
@@ -314,7 +344,6 @@ CONFIG_ARCH_SUPPORTS_MSI=y
314# CONFIG_PCI_STUB is not set 344# CONFIG_PCI_STUB is not set
315# CONFIG_PCI_IOV is not set 345# CONFIG_PCI_IOV is not set
316CONFIG_PCCARD=y 346CONFIG_PCCARD=y
317# CONFIG_PCMCIA_DEBUG is not set
318CONFIG_PCMCIA=y 347CONFIG_PCMCIA=y
319# CONFIG_PCMCIA_LOAD_CIS is not set 348# CONFIG_PCMCIA_LOAD_CIS is not set
320# CONFIG_PCMCIA_IOCTL is not set 349# CONFIG_PCMCIA_IOCTL is not set
@@ -414,6 +443,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
414CONFIG_INET6_XFRM_MODE_BEET=m 443CONFIG_INET6_XFRM_MODE_BEET=m
415# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 444# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
416CONFIG_IPV6_SIT=m 445CONFIG_IPV6_SIT=m
446# CONFIG_IPV6_SIT_6RD is not set
417CONFIG_IPV6_NDISC_NODETYPE=y 447CONFIG_IPV6_NDISC_NODETYPE=y
418CONFIG_IPV6_TUNNEL=m 448CONFIG_IPV6_TUNNEL=m
419# CONFIG_IPV6_MULTIPLE_TABLES is not set 449# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -451,7 +481,13 @@ CONFIG_NET_PKTGEN=m
451# CONFIG_BT is not set 481# CONFIG_BT is not set
452# CONFIG_AF_RXRPC is not set 482# CONFIG_AF_RXRPC is not set
453CONFIG_FIB_RULES=y 483CONFIG_FIB_RULES=y
454# CONFIG_WIRELESS is not set 484CONFIG_WIRELESS=y
485# CONFIG_CFG80211 is not set
486# CONFIG_LIB80211 is not set
487
488#
489# CFG80211 needs to be enabled for MAC80211
490#
455# CONFIG_WIMAX is not set 491# CONFIG_WIMAX is not set
456# CONFIG_RFKILL is not set 492# CONFIG_RFKILL is not set
457# CONFIG_NET_9P is not set 493# CONFIG_NET_9P is not set
@@ -570,6 +606,10 @@ CONFIG_BLK_DEV=y
570# CONFIG_BLK_DEV_COW_COMMON is not set 606# CONFIG_BLK_DEV_COW_COMMON is not set
571CONFIG_BLK_DEV_LOOP=m 607CONFIG_BLK_DEV_LOOP=m
572CONFIG_BLK_DEV_CRYPTOLOOP=m 608CONFIG_BLK_DEV_CRYPTOLOOP=m
609
610#
611# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
612#
573CONFIG_BLK_DEV_NBD=m 613CONFIG_BLK_DEV_NBD=m
574# CONFIG_BLK_DEV_SX8 is not set 614# CONFIG_BLK_DEV_SX8 is not set
575# CONFIG_BLK_DEV_UB is not set 615# CONFIG_BLK_DEV_UB is not set
@@ -581,6 +621,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
581# CONFIG_ATA_OVER_ETH is not set 621# CONFIG_ATA_OVER_ETH is not set
582# CONFIG_BLK_DEV_HD is not set 622# CONFIG_BLK_DEV_HD is not set
583CONFIG_MISC_DEVICES=y 623CONFIG_MISC_DEVICES=y
624# CONFIG_AD525X_DPOT is not set
584# CONFIG_PHANTOM is not set 625# CONFIG_PHANTOM is not set
585# CONFIG_SGI_IOC4 is not set 626# CONFIG_SGI_IOC4 is not set
586# CONFIG_TIFM_CORE is not set 627# CONFIG_TIFM_CORE is not set
@@ -588,6 +629,7 @@ CONFIG_MISC_DEVICES=y
588# CONFIG_ENCLOSURE_SERVICES is not set 629# CONFIG_ENCLOSURE_SERVICES is not set
589# CONFIG_HP_ILO is not set 630# CONFIG_HP_ILO is not set
590# CONFIG_ISL29003 is not set 631# CONFIG_ISL29003 is not set
632CONFIG_DS1682=y
591# CONFIG_C2PORT is not set 633# CONFIG_C2PORT is not set
592 634
593# 635#
@@ -689,7 +731,9 @@ CONFIG_SCSI_LOWLEVEL=y
689# CONFIG_SCSI_BNX2_ISCSI is not set 731# CONFIG_SCSI_BNX2_ISCSI is not set
690# CONFIG_BE2ISCSI is not set 732# CONFIG_BE2ISCSI is not set
691# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 733# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
734# CONFIG_SCSI_HPSA is not set
692# CONFIG_SCSI_3W_9XXX is not set 735# CONFIG_SCSI_3W_9XXX is not set
736# CONFIG_SCSI_3W_SAS is not set
693# CONFIG_SCSI_ACARD is not set 737# CONFIG_SCSI_ACARD is not set
694# CONFIG_SCSI_AACRAID is not set 738# CONFIG_SCSI_AACRAID is not set
695# CONFIG_SCSI_AIC7XXX is not set 739# CONFIG_SCSI_AIC7XXX is not set
@@ -728,6 +772,7 @@ CONFIG_SCSI_LOWLEVEL=y
728# CONFIG_SCSI_NSP32 is not set 772# CONFIG_SCSI_NSP32 is not set
729# CONFIG_SCSI_DEBUG is not set 773# CONFIG_SCSI_DEBUG is not set
730# CONFIG_SCSI_PMCRAID is not set 774# CONFIG_SCSI_PMCRAID is not set
775# CONFIG_SCSI_PM8001 is not set
731# CONFIG_SCSI_SRP is not set 776# CONFIG_SCSI_SRP is not set
732# CONFIG_SCSI_BFA_FC is not set 777# CONFIG_SCSI_BFA_FC is not set
733# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 778# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -753,7 +798,7 @@ CONFIG_SATA_SIL24=y
753# 798#
754 799
755# 800#
756# See the help texts for more information. 801# The newer stack is recommended.
757# 802#
758# CONFIG_FIREWIRE is not set 803# CONFIG_FIREWIRE is not set
759# CONFIG_IEEE1394 is not set 804# CONFIG_IEEE1394 is not set
@@ -840,8 +885,14 @@ CONFIG_GIANFAR=y
840# CONFIG_NETDEV_10000 is not set 885# CONFIG_NETDEV_10000 is not set
841# CONFIG_TR is not set 886# CONFIG_TR is not set
842CONFIG_WLAN=y 887CONFIG_WLAN=y
843# CONFIG_WLAN_PRE80211 is not set 888# CONFIG_PCMCIA_RAYCS is not set
844# CONFIG_WLAN_80211 is not set 889# CONFIG_AIRO is not set
890# CONFIG_ATMEL is not set
891# CONFIG_AIRO_CS is not set
892# CONFIG_PCMCIA_WL3501 is not set
893# CONFIG_PRISM54 is not set
894# CONFIG_USB_ZD1201 is not set
895# CONFIG_HOSTAP is not set
845 896
846# 897#
847# Enable WiMAX (Networking options) to see the WiMAX drivers 898# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -880,6 +931,7 @@ CONFIG_NETCONSOLE=y
880CONFIG_NETPOLL=y 931CONFIG_NETPOLL=y
881CONFIG_NETPOLL_TRAP=y 932CONFIG_NETPOLL_TRAP=y
882CONFIG_NET_POLL_CONTROLLER=y 933CONFIG_NET_POLL_CONTROLLER=y
934# CONFIG_VMXNET3 is not set
883# CONFIG_ISDN is not set 935# CONFIG_ISDN is not set
884# CONFIG_PHONE is not set 936# CONFIG_PHONE is not set
885 937
@@ -889,6 +941,7 @@ CONFIG_NET_POLL_CONTROLLER=y
889CONFIG_INPUT=y 941CONFIG_INPUT=y
890# CONFIG_INPUT_FF_MEMLESS is not set 942# CONFIG_INPUT_FF_MEMLESS is not set
891# CONFIG_INPUT_POLLDEV is not set 943# CONFIG_INPUT_POLLDEV is not set
944# CONFIG_INPUT_SPARSEKMAP is not set
892 945
893# 946#
894# Userland interfaces 947# Userland interfaces
@@ -948,6 +1001,7 @@ CONFIG_SERIAL_CORE=y
948CONFIG_SERIAL_CORE_CONSOLE=y 1001CONFIG_SERIAL_CORE_CONSOLE=y
949# CONFIG_SERIAL_JSM is not set 1002# CONFIG_SERIAL_JSM is not set
950# CONFIG_SERIAL_OF_PLATFORM is not set 1003# CONFIG_SERIAL_OF_PLATFORM is not set
1004# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
951CONFIG_UNIX98_PTYS=y 1005CONFIG_UNIX98_PTYS=y
952# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1006# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
953# CONFIG_LEGACY_PTYS is not set 1007# CONFIG_LEGACY_PTYS is not set
@@ -1013,11 +1067,6 @@ CONFIG_I2C_MPC=y
1013# CONFIG_I2C_TINY_USB is not set 1067# CONFIG_I2C_TINY_USB is not set
1014 1068
1015# 1069#
1016# Graphics adapter I2C/DDC channel drivers
1017#
1018# CONFIG_I2C_VOODOO3 is not set
1019
1020#
1021# Other I2C/SMBus bus drivers 1070# Other I2C/SMBus bus drivers
1022# 1071#
1023# CONFIG_I2C_PCA_PLATFORM is not set 1072# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1026,7 +1075,6 @@ CONFIG_I2C_MPC=y
1026# 1075#
1027# Miscellaneous I2C Chip support 1076# Miscellaneous I2C Chip support
1028# 1077#
1029CONFIG_DS1682=y
1030# CONFIG_SENSORS_TSL2550 is not set 1078# CONFIG_SENSORS_TSL2550 is not set
1031# CONFIG_I2C_DEBUG_CORE is not set 1079# CONFIG_I2C_DEBUG_CORE is not set
1032# CONFIG_I2C_DEBUG_ALGO is not set 1080# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1058,6 +1106,7 @@ CONFIG_GPIO_SYSFS=y
1058# 1106#
1059# PCI GPIO expanders: 1107# PCI GPIO expanders:
1060# 1108#
1109# CONFIG_GPIO_CS5535 is not set
1061# CONFIG_GPIO_BT8XX is not set 1110# CONFIG_GPIO_BT8XX is not set
1062# CONFIG_GPIO_LANGWELL is not set 1111# CONFIG_GPIO_LANGWELL is not set
1063 1112
@@ -1100,6 +1149,7 @@ CONFIG_HWMON=y
1100# CONFIG_SENSORS_GL520SM is not set 1149# CONFIG_SENSORS_GL520SM is not set
1101# CONFIG_SENSORS_IT87 is not set 1150# CONFIG_SENSORS_IT87 is not set
1102# CONFIG_SENSORS_LM63 is not set 1151# CONFIG_SENSORS_LM63 is not set
1152# CONFIG_SENSORS_LM73 is not set
1103# CONFIG_SENSORS_LM75 is not set 1153# CONFIG_SENSORS_LM75 is not set
1104# CONFIG_SENSORS_LM77 is not set 1154# CONFIG_SENSORS_LM77 is not set
1105# CONFIG_SENSORS_LM78 is not set 1155# CONFIG_SENSORS_LM78 is not set
@@ -1139,6 +1189,7 @@ CONFIG_SENSORS_LM92=y
1139# CONFIG_SENSORS_W83L786NG is not set 1189# CONFIG_SENSORS_W83L786NG is not set
1140# CONFIG_SENSORS_W83627HF is not set 1190# CONFIG_SENSORS_W83627HF is not set
1141# CONFIG_SENSORS_W83627EHF is not set 1191# CONFIG_SENSORS_W83627EHF is not set
1192# CONFIG_SENSORS_LIS3_I2C is not set
1142# CONFIG_THERMAL is not set 1193# CONFIG_THERMAL is not set
1143CONFIG_WATCHDOG=y 1194CONFIG_WATCHDOG=y
1144# CONFIG_WATCHDOG_NOWAYOUT is not set 1195# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1178,11 +1229,13 @@ CONFIG_SSB_POSSIBLE=y
1178# CONFIG_TWL4030_CORE is not set 1229# CONFIG_TWL4030_CORE is not set
1179# CONFIG_MFD_TMIO is not set 1230# CONFIG_MFD_TMIO is not set
1180# CONFIG_PMIC_DA903X is not set 1231# CONFIG_PMIC_DA903X is not set
1232# CONFIG_PMIC_ADP5520 is not set
1181# CONFIG_MFD_WM8400 is not set 1233# CONFIG_MFD_WM8400 is not set
1182# CONFIG_MFD_WM831X is not set 1234# CONFIG_MFD_WM831X is not set
1183# CONFIG_MFD_WM8350_I2C is not set 1235# CONFIG_MFD_WM8350_I2C is not set
1184# CONFIG_MFD_PCF50633 is not set 1236# CONFIG_MFD_PCF50633 is not set
1185# CONFIG_AB3100_CORE is not set 1237# CONFIG_AB3100_CORE is not set
1238# CONFIG_MFD_88PM8607 is not set
1186# CONFIG_REGULATOR is not set 1239# CONFIG_REGULATOR is not set
1187# CONFIG_MEDIA_SUPPORT is not set 1240# CONFIG_MEDIA_SUPPORT is not set
1188 1241
@@ -1281,6 +1334,7 @@ CONFIG_USB=y
1281CONFIG_USB_EHCI_HCD=y 1334CONFIG_USB_EHCI_HCD=y
1282# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1335# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1283# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1336# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1337# CONFIG_XPS_USB_HCD_XILINX is not set
1284# CONFIG_USB_EHCI_FSL is not set 1338# CONFIG_USB_EHCI_FSL is not set
1285# CONFIG_USB_EHCI_HCD_PPC_OF is not set 1339# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1286# CONFIG_USB_OXU210HP_HCD is not set 1340# CONFIG_USB_OXU210HP_HCD is not set
@@ -1407,6 +1461,7 @@ CONFIG_RTC_INTF_DEV=y
1407# CONFIG_RTC_DRV_PCF8563 is not set 1461# CONFIG_RTC_DRV_PCF8563 is not set
1408# CONFIG_RTC_DRV_PCF8583 is not set 1462# CONFIG_RTC_DRV_PCF8583 is not set
1409# CONFIG_RTC_DRV_M41T80 is not set 1463# CONFIG_RTC_DRV_M41T80 is not set
1464# CONFIG_RTC_DRV_BQ32K is not set
1410# CONFIG_RTC_DRV_S35390A is not set 1465# CONFIG_RTC_DRV_S35390A is not set
1411# CONFIG_RTC_DRV_FM3130 is not set 1466# CONFIG_RTC_DRV_FM3130 is not set
1412CONFIG_RTC_DRV_RX8581=y 1467CONFIG_RTC_DRV_RX8581=y
@@ -1428,7 +1483,9 @@ CONFIG_RTC_DRV_RX8581=y
1428# CONFIG_RTC_DRV_M48T86 is not set 1483# CONFIG_RTC_DRV_M48T86 is not set
1429# CONFIG_RTC_DRV_M48T35 is not set 1484# CONFIG_RTC_DRV_M48T35 is not set
1430# CONFIG_RTC_DRV_M48T59 is not set 1485# CONFIG_RTC_DRV_M48T59 is not set
1486# CONFIG_RTC_DRV_MSM6242 is not set
1431# CONFIG_RTC_DRV_BQ4802 is not set 1487# CONFIG_RTC_DRV_BQ4802 is not set
1488# CONFIG_RTC_DRV_RP5C01 is not set
1432# CONFIG_RTC_DRV_V3020 is not set 1489# CONFIG_RTC_DRV_V3020 is not set
1433 1490
1434# 1491#
@@ -1653,7 +1710,7 @@ CONFIG_MAGIC_SYSRQ=y
1653# CONFIG_DEBUG_FS is not set 1710# CONFIG_DEBUG_FS is not set
1654# CONFIG_HEADERS_CHECK is not set 1711# CONFIG_HEADERS_CHECK is not set
1655# CONFIG_DEBUG_KERNEL is not set 1712# CONFIG_DEBUG_KERNEL is not set
1656# CONFIG_DEBUG_BUGVERBOSE is not set 1713CONFIG_DEBUG_BUGVERBOSE=y
1657# CONFIG_DEBUG_MEMORY_INIT is not set 1714# CONFIG_DEBUG_MEMORY_INIT is not set
1658# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1715# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1659# CONFIG_LATENCYTOP is not set 1716# CONFIG_LATENCYTOP is not set
@@ -1680,7 +1737,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1680# CONFIG_KEYS is not set 1737# CONFIG_KEYS is not set
1681# CONFIG_SECURITY is not set 1738# CONFIG_SECURITY is not set
1682# CONFIG_SECURITYFS is not set 1739# CONFIG_SECURITYFS is not set
1683# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1740# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1741# CONFIG_DEFAULT_SECURITY_SMACK is not set
1742# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1743CONFIG_DEFAULT_SECURITY_DAC=y
1744CONFIG_DEFAULT_SECURITY=""
1684CONFIG_CRYPTO=y 1745CONFIG_CRYPTO=y
1685 1746
1686# 1747#
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 1975d41e0763..4554d9bb03e5 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:48 2009 4# Wed Jan 6 09:24:42 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +94,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
91# 94#
92CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
93# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
94# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -182,14 +186,41 @@ CONFIG_LBDAF=y
182# IO Schedulers 186# IO Schedulers
183# 187#
184CONFIG_IOSCHED_NOOP=y 188CONFIG_IOSCHED_NOOP=y
185CONFIG_IOSCHED_AS=y
186CONFIG_IOSCHED_DEADLINE=y 189CONFIG_IOSCHED_DEADLINE=y
187CONFIG_IOSCHED_CFQ=y 190CONFIG_IOSCHED_CFQ=y
188# CONFIG_DEFAULT_AS is not set
189# CONFIG_DEFAULT_DEADLINE is not set 191# CONFIG_DEFAULT_DEADLINE is not set
190CONFIG_DEFAULT_CFQ=y 192CONFIG_DEFAULT_CFQ=y
191# CONFIG_DEFAULT_NOOP is not set 193# CONFIG_DEFAULT_NOOP is not set
192CONFIG_DEFAULT_IOSCHED="cfq" 194CONFIG_DEFAULT_IOSCHED="cfq"
195# CONFIG_INLINE_SPIN_TRYLOCK is not set
196# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
197# CONFIG_INLINE_SPIN_LOCK is not set
198# CONFIG_INLINE_SPIN_LOCK_BH is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
200# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
201# CONFIG_INLINE_SPIN_UNLOCK is not set
202# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
203# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
204# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_READ_TRYLOCK is not set
206# CONFIG_INLINE_READ_LOCK is not set
207# CONFIG_INLINE_READ_LOCK_BH is not set
208# CONFIG_INLINE_READ_LOCK_IRQ is not set
209# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
210# CONFIG_INLINE_READ_UNLOCK is not set
211# CONFIG_INLINE_READ_UNLOCK_BH is not set
212# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
213# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
214# CONFIG_INLINE_WRITE_TRYLOCK is not set
215# CONFIG_INLINE_WRITE_LOCK is not set
216# CONFIG_INLINE_WRITE_LOCK_BH is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
218# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
219# CONFIG_INLINE_WRITE_UNLOCK is not set
220# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
221# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
222# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
223CONFIG_MUTEX_SPIN_ON_OWNER=y
193# CONFIG_FREEZER is not set 224# CONFIG_FREEZER is not set
194 225
195# 226#
@@ -260,6 +291,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
262CONFIG_IRQ_ALL_CPUS=y 293CONFIG_IRQ_ALL_CPUS=y
294CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 295CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 296CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 297CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +308,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 308CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 309CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 310CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 311# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 312CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 313CONFIG_PPC_4K_PAGES=y
@@ -400,6 +430,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
400CONFIG_INET6_XFRM_MODE_BEET=m 430CONFIG_INET6_XFRM_MODE_BEET=m
401# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 431# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
402CONFIG_IPV6_SIT=m 432CONFIG_IPV6_SIT=m
433# CONFIG_IPV6_SIT_6RD is not set
403CONFIG_IPV6_NDISC_NODETYPE=y 434CONFIG_IPV6_NDISC_NODETYPE=y
404CONFIG_IPV6_TUNNEL=m 435CONFIG_IPV6_TUNNEL=m
405# CONFIG_IPV6_MULTIPLE_TABLES is not set 436# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -588,9 +619,6 @@ CONFIG_NET_PKTGEN=m
588CONFIG_FIB_RULES=y 619CONFIG_FIB_RULES=y
589CONFIG_WIRELESS=y 620CONFIG_WIRELESS=y
590# CONFIG_CFG80211 is not set 621# CONFIG_CFG80211 is not set
591CONFIG_CFG80211_DEFAULT_PS_VALUE=0
592CONFIG_WIRELESS_OLD_REGULATORY=y
593# CONFIG_WIRELESS_EXT is not set
594# CONFIG_LIB80211 is not set 622# CONFIG_LIB80211 is not set
595 623
596# 624#
@@ -719,6 +747,10 @@ CONFIG_BLK_DEV=y
719# CONFIG_BLK_DEV_COW_COMMON is not set 747# CONFIG_BLK_DEV_COW_COMMON is not set
720CONFIG_BLK_DEV_LOOP=m 748CONFIG_BLK_DEV_LOOP=m
721CONFIG_BLK_DEV_CRYPTOLOOP=m 749CONFIG_BLK_DEV_CRYPTOLOOP=m
750
751#
752# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
753#
722CONFIG_BLK_DEV_NBD=m 754CONFIG_BLK_DEV_NBD=m
723# CONFIG_BLK_DEV_SX8 is not set 755# CONFIG_BLK_DEV_SX8 is not set
724# CONFIG_BLK_DEV_UB is not set 756# CONFIG_BLK_DEV_UB is not set
@@ -730,6 +762,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
730# CONFIG_ATA_OVER_ETH is not set 762# CONFIG_ATA_OVER_ETH is not set
731# CONFIG_BLK_DEV_HD is not set 763# CONFIG_BLK_DEV_HD is not set
732CONFIG_MISC_DEVICES=y 764CONFIG_MISC_DEVICES=y
765# CONFIG_AD525X_DPOT is not set
733# CONFIG_PHANTOM is not set 766# CONFIG_PHANTOM is not set
734# CONFIG_SGI_IOC4 is not set 767# CONFIG_SGI_IOC4 is not set
735# CONFIG_TIFM_CORE is not set 768# CONFIG_TIFM_CORE is not set
@@ -737,6 +770,7 @@ CONFIG_MISC_DEVICES=y
737# CONFIG_ENCLOSURE_SERVICES is not set 770# CONFIG_ENCLOSURE_SERVICES is not set
738# CONFIG_HP_ILO is not set 771# CONFIG_HP_ILO is not set
739# CONFIG_ISL29003 is not set 772# CONFIG_ISL29003 is not set
773CONFIG_DS1682=y
740# CONFIG_C2PORT is not set 774# CONFIG_C2PORT is not set
741 775
742# 776#
@@ -789,7 +823,9 @@ CONFIG_SCSI_LOWLEVEL=y
789# CONFIG_SCSI_BNX2_ISCSI is not set 823# CONFIG_SCSI_BNX2_ISCSI is not set
790# CONFIG_BE2ISCSI is not set 824# CONFIG_BE2ISCSI is not set
791# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 825# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
826# CONFIG_SCSI_HPSA is not set
792# CONFIG_SCSI_3W_9XXX is not set 827# CONFIG_SCSI_3W_9XXX is not set
828# CONFIG_SCSI_3W_SAS is not set
793# CONFIG_SCSI_ACARD is not set 829# CONFIG_SCSI_ACARD is not set
794# CONFIG_SCSI_AACRAID is not set 830# CONFIG_SCSI_AACRAID is not set
795# CONFIG_SCSI_AIC7XXX is not set 831# CONFIG_SCSI_AIC7XXX is not set
@@ -828,6 +864,7 @@ CONFIG_SCSI_LOWLEVEL=y
828# CONFIG_SCSI_NSP32 is not set 864# CONFIG_SCSI_NSP32 is not set
829# CONFIG_SCSI_DEBUG is not set 865# CONFIG_SCSI_DEBUG is not set
830# CONFIG_SCSI_PMCRAID is not set 866# CONFIG_SCSI_PMCRAID is not set
867# CONFIG_SCSI_PM8001 is not set
831# CONFIG_SCSI_SRP is not set 868# CONFIG_SCSI_SRP is not set
832# CONFIG_SCSI_BFA_FC is not set 869# CONFIG_SCSI_BFA_FC is not set
833# CONFIG_SCSI_DH is not set 870# CONFIG_SCSI_DH is not set
@@ -883,15 +920,16 @@ CONFIG_SATA_SIL=y
883# CONFIG_PATA_NS87415 is not set 920# CONFIG_PATA_NS87415 is not set
884# CONFIG_PATA_OPTI is not set 921# CONFIG_PATA_OPTI is not set
885# CONFIG_PATA_OPTIDMA is not set 922# CONFIG_PATA_OPTIDMA is not set
923# CONFIG_PATA_PDC2027X is not set
886# CONFIG_PATA_PDC_OLD is not set 924# CONFIG_PATA_PDC_OLD is not set
887# CONFIG_PATA_RADISYS is not set 925# CONFIG_PATA_RADISYS is not set
888# CONFIG_PATA_RDC is not set 926# CONFIG_PATA_RDC is not set
889# CONFIG_PATA_RZ1000 is not set 927# CONFIG_PATA_RZ1000 is not set
890# CONFIG_PATA_SC1200 is not set 928# CONFIG_PATA_SC1200 is not set
891# CONFIG_PATA_SERVERWORKS is not set 929# CONFIG_PATA_SERVERWORKS is not set
892# CONFIG_PATA_PDC2027X is not set
893# CONFIG_PATA_SIL680 is not set 930# CONFIG_PATA_SIL680 is not set
894# CONFIG_PATA_SIS is not set 931# CONFIG_PATA_SIS is not set
932# CONFIG_PATA_TOSHIBA is not set
895# CONFIG_PATA_VIA is not set 933# CONFIG_PATA_VIA is not set
896# CONFIG_PATA_WINBOND is not set 934# CONFIG_PATA_WINBOND is not set
897# CONFIG_PATA_PLATFORM is not set 935# CONFIG_PATA_PLATFORM is not set
@@ -908,7 +946,7 @@ CONFIG_SATA_SIL=y
908# 946#
909 947
910# 948#
911# See the help texts for more information. 949# The newer stack is recommended.
912# 950#
913# CONFIG_FIREWIRE is not set 951# CONFIG_FIREWIRE is not set
914# CONFIG_IEEE1394 is not set 952# CONFIG_IEEE1394 is not set
@@ -995,8 +1033,11 @@ CONFIG_GIANFAR=y
995# CONFIG_NETDEV_10000 is not set 1033# CONFIG_NETDEV_10000 is not set
996# CONFIG_TR is not set 1034# CONFIG_TR is not set
997CONFIG_WLAN=y 1035CONFIG_WLAN=y
998# CONFIG_WLAN_PRE80211 is not set 1036# CONFIG_AIRO is not set
999# CONFIG_WLAN_80211 is not set 1037# CONFIG_ATMEL is not set
1038# CONFIG_PRISM54 is not set
1039# CONFIG_USB_ZD1201 is not set
1040# CONFIG_HOSTAP is not set
1000 1041
1001# 1042#
1002# Enable WiMAX (Networking options) to see the WiMAX drivers 1043# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1050,6 +1091,7 @@ CONFIG_NETCONSOLE=y
1050CONFIG_NETPOLL=y 1091CONFIG_NETPOLL=y
1051CONFIG_NETPOLL_TRAP=y 1092CONFIG_NETPOLL_TRAP=y
1052CONFIG_NET_POLL_CONTROLLER=y 1093CONFIG_NET_POLL_CONTROLLER=y
1094# CONFIG_VMXNET3 is not set
1053# CONFIG_ISDN is not set 1095# CONFIG_ISDN is not set
1054# CONFIG_PHONE is not set 1096# CONFIG_PHONE is not set
1055 1097
@@ -1059,6 +1101,7 @@ CONFIG_NET_POLL_CONTROLLER=y
1059CONFIG_INPUT=y 1101CONFIG_INPUT=y
1060CONFIG_INPUT_FF_MEMLESS=m 1102CONFIG_INPUT_FF_MEMLESS=m
1061# CONFIG_INPUT_POLLDEV is not set 1103# CONFIG_INPUT_POLLDEV is not set
1104# CONFIG_INPUT_SPARSEKMAP is not set
1062 1105
1063# 1106#
1064# Userland interfaces 1107# Userland interfaces
@@ -1117,6 +1160,7 @@ CONFIG_SERIAL_CORE=y
1117CONFIG_SERIAL_CORE_CONSOLE=y 1160CONFIG_SERIAL_CORE_CONSOLE=y
1118# CONFIG_SERIAL_JSM is not set 1161# CONFIG_SERIAL_JSM is not set
1119# CONFIG_SERIAL_OF_PLATFORM is not set 1162# CONFIG_SERIAL_OF_PLATFORM is not set
1163# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
1120CONFIG_UNIX98_PTYS=y 1164CONFIG_UNIX98_PTYS=y
1121# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1165# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1122# CONFIG_LEGACY_PTYS is not set 1166# CONFIG_LEGACY_PTYS is not set
@@ -1174,11 +1218,6 @@ CONFIG_I2C_MPC=y
1174# CONFIG_I2C_TINY_USB is not set 1218# CONFIG_I2C_TINY_USB is not set
1175 1219
1176# 1220#
1177# Graphics adapter I2C/DDC channel drivers
1178#
1179# CONFIG_I2C_VOODOO3 is not set
1180
1181#
1182# Other I2C/SMBus bus drivers 1221# Other I2C/SMBus bus drivers
1183# 1222#
1184# CONFIG_I2C_PCA_PLATFORM is not set 1223# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1187,7 +1226,6 @@ CONFIG_I2C_MPC=y
1187# 1226#
1188# Miscellaneous I2C Chip support 1227# Miscellaneous I2C Chip support
1189# 1228#
1190CONFIG_DS1682=y
1191# CONFIG_SENSORS_TSL2550 is not set 1229# CONFIG_SENSORS_TSL2550 is not set
1192# CONFIG_I2C_DEBUG_CORE is not set 1230# CONFIG_I2C_DEBUG_CORE is not set
1193# CONFIG_I2C_DEBUG_ALGO is not set 1231# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1220,6 +1258,7 @@ CONFIG_GPIOLIB=y
1220# 1258#
1221# PCI GPIO expanders: 1259# PCI GPIO expanders:
1222# 1260#
1261# CONFIG_GPIO_CS5535 is not set
1223# CONFIG_GPIO_BT8XX is not set 1262# CONFIG_GPIO_BT8XX is not set
1224# CONFIG_GPIO_LANGWELL is not set 1263# CONFIG_GPIO_LANGWELL is not set
1225 1264
@@ -1262,6 +1301,7 @@ CONFIG_HWMON=y
1262# CONFIG_SENSORS_GL520SM is not set 1301# CONFIG_SENSORS_GL520SM is not set
1263# CONFIG_SENSORS_IT87 is not set 1302# CONFIG_SENSORS_IT87 is not set
1264# CONFIG_SENSORS_LM63 is not set 1303# CONFIG_SENSORS_LM63 is not set
1304# CONFIG_SENSORS_LM73 is not set
1265# CONFIG_SENSORS_LM75 is not set 1305# CONFIG_SENSORS_LM75 is not set
1266# CONFIG_SENSORS_LM77 is not set 1306# CONFIG_SENSORS_LM77 is not set
1267# CONFIG_SENSORS_LM78 is not set 1307# CONFIG_SENSORS_LM78 is not set
@@ -1301,6 +1341,7 @@ CONFIG_SENSORS_LM92=y
1301# CONFIG_SENSORS_W83L786NG is not set 1341# CONFIG_SENSORS_W83L786NG is not set
1302# CONFIG_SENSORS_W83627HF is not set 1342# CONFIG_SENSORS_W83627HF is not set
1303# CONFIG_SENSORS_W83627EHF is not set 1343# CONFIG_SENSORS_W83627EHF is not set
1344# CONFIG_SENSORS_LIS3_I2C is not set
1304# CONFIG_THERMAL is not set 1345# CONFIG_THERMAL is not set
1305CONFIG_WATCHDOG=y 1346CONFIG_WATCHDOG=y
1306# CONFIG_WATCHDOG_NOWAYOUT is not set 1347# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1340,11 +1381,13 @@ CONFIG_SSB_POSSIBLE=y
1340# CONFIG_TWL4030_CORE is not set 1381# CONFIG_TWL4030_CORE is not set
1341# CONFIG_MFD_TMIO is not set 1382# CONFIG_MFD_TMIO is not set
1342# CONFIG_PMIC_DA903X is not set 1383# CONFIG_PMIC_DA903X is not set
1384# CONFIG_PMIC_ADP5520 is not set
1343# CONFIG_MFD_WM8400 is not set 1385# CONFIG_MFD_WM8400 is not set
1344# CONFIG_MFD_WM831X is not set 1386# CONFIG_MFD_WM831X is not set
1345# CONFIG_MFD_WM8350_I2C is not set 1387# CONFIG_MFD_WM8350_I2C is not set
1346# CONFIG_MFD_PCF50633 is not set 1388# CONFIG_MFD_PCF50633 is not set
1347# CONFIG_AB3100_CORE is not set 1389# CONFIG_AB3100_CORE is not set
1390# CONFIG_MFD_88PM8607 is not set
1348# CONFIG_REGULATOR is not set 1391# CONFIG_REGULATOR is not set
1349# CONFIG_MEDIA_SUPPORT is not set 1392# CONFIG_MEDIA_SUPPORT is not set
1350 1393
@@ -1443,6 +1486,7 @@ CONFIG_USB=y
1443CONFIG_USB_EHCI_HCD=y 1486CONFIG_USB_EHCI_HCD=y
1444# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1487# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1445# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1488# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1489# CONFIG_XPS_USB_HCD_XILINX is not set
1446# CONFIG_USB_EHCI_FSL is not set 1490# CONFIG_USB_EHCI_FSL is not set
1447# CONFIG_USB_EHCI_HCD_PPC_OF is not set 1491# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1448# CONFIG_USB_OXU210HP_HCD is not set 1492# CONFIG_USB_OXU210HP_HCD is not set
@@ -1570,6 +1614,7 @@ CONFIG_RTC_INTF_DEV=y
1570# CONFIG_RTC_DRV_PCF8563 is not set 1614# CONFIG_RTC_DRV_PCF8563 is not set
1571# CONFIG_RTC_DRV_PCF8583 is not set 1615# CONFIG_RTC_DRV_PCF8583 is not set
1572# CONFIG_RTC_DRV_M41T80 is not set 1616# CONFIG_RTC_DRV_M41T80 is not set
1617# CONFIG_RTC_DRV_BQ32K is not set
1573# CONFIG_RTC_DRV_S35390A is not set 1618# CONFIG_RTC_DRV_S35390A is not set
1574# CONFIG_RTC_DRV_FM3130 is not set 1619# CONFIG_RTC_DRV_FM3130 is not set
1575CONFIG_RTC_DRV_RX8581=y 1620CONFIG_RTC_DRV_RX8581=y
@@ -1591,7 +1636,9 @@ CONFIG_RTC_DRV_RX8581=y
1591# CONFIG_RTC_DRV_M48T86 is not set 1636# CONFIG_RTC_DRV_M48T86 is not set
1592# CONFIG_RTC_DRV_M48T35 is not set 1637# CONFIG_RTC_DRV_M48T35 is not set
1593# CONFIG_RTC_DRV_M48T59 is not set 1638# CONFIG_RTC_DRV_M48T59 is not set
1639# CONFIG_RTC_DRV_MSM6242 is not set
1594# CONFIG_RTC_DRV_BQ4802 is not set 1640# CONFIG_RTC_DRV_BQ4802 is not set
1641# CONFIG_RTC_DRV_RP5C01 is not set
1595# CONFIG_RTC_DRV_V3020 is not set 1642# CONFIG_RTC_DRV_V3020 is not set
1596 1643
1597# 1644#
@@ -1891,9 +1938,12 @@ CONFIG_SECURITY=y
1891CONFIG_SECURITY_NETWORK=y 1938CONFIG_SECURITY_NETWORK=y
1892# CONFIG_SECURITY_NETWORK_XFRM is not set 1939# CONFIG_SECURITY_NETWORK_XFRM is not set
1893# CONFIG_SECURITY_PATH is not set 1940# CONFIG_SECURITY_PATH is not set
1894# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1895# CONFIG_SECURITY_ROOTPLUG is not set
1896# CONFIG_SECURITY_TOMOYO is not set 1941# CONFIG_SECURITY_TOMOYO is not set
1942# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1943# CONFIG_DEFAULT_SECURITY_SMACK is not set
1944# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1945CONFIG_DEFAULT_SECURITY_DAC=y
1946CONFIG_DEFAULT_SECURITY=""
1897CONFIG_CRYPTO=y 1947CONFIG_CRYPTO=y
1898 1948
1899# 1949#
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index de4d52504fe4..aab3baebab8c 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:45 2009 4# Wed Jan 6 09:24:39 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,8 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
64CONFIG_ARCH_SUSPEND_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -86,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
86# 89#
87CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
88# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
89# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
90CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
91# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -176,14 +180,41 @@ CONFIG_LBDAF=y
176# IO Schedulers 180# IO Schedulers
177# 181#
178CONFIG_IOSCHED_NOOP=y 182CONFIG_IOSCHED_NOOP=y
179# CONFIG_IOSCHED_AS is not set
180CONFIG_IOSCHED_DEADLINE=y 183CONFIG_IOSCHED_DEADLINE=y
181# CONFIG_IOSCHED_CFQ is not set 184# CONFIG_IOSCHED_CFQ is not set
182# CONFIG_DEFAULT_AS is not set
183CONFIG_DEFAULT_DEADLINE=y 185CONFIG_DEFAULT_DEADLINE=y
184# CONFIG_DEFAULT_CFQ is not set 186# CONFIG_DEFAULT_CFQ is not set
185# CONFIG_DEFAULT_NOOP is not set 187# CONFIG_DEFAULT_NOOP is not set
186CONFIG_DEFAULT_IOSCHED="deadline" 188CONFIG_DEFAULT_IOSCHED="deadline"
189# CONFIG_INLINE_SPIN_TRYLOCK is not set
190# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
191# CONFIG_INLINE_SPIN_LOCK is not set
192# CONFIG_INLINE_SPIN_LOCK_BH is not set
193# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
194# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
195CONFIG_INLINE_SPIN_UNLOCK=y
196# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
197CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
198# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
199# CONFIG_INLINE_READ_TRYLOCK is not set
200# CONFIG_INLINE_READ_LOCK is not set
201# CONFIG_INLINE_READ_LOCK_BH is not set
202# CONFIG_INLINE_READ_LOCK_IRQ is not set
203# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
204CONFIG_INLINE_READ_UNLOCK=y
205# CONFIG_INLINE_READ_UNLOCK_BH is not set
206CONFIG_INLINE_READ_UNLOCK_IRQ=y
207# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
208# CONFIG_INLINE_WRITE_TRYLOCK is not set
209# CONFIG_INLINE_WRITE_LOCK is not set
210# CONFIG_INLINE_WRITE_LOCK_BH is not set
211# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
212# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
213CONFIG_INLINE_WRITE_UNLOCK=y
214# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
215CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
216# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
217# CONFIG_MUTEX_SPIN_ON_OWNER is not set
187# CONFIG_FREEZER is not set 218# CONFIG_FREEZER is not set
188 219
189# 220#
@@ -254,6 +285,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 285CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
255# CONFIG_KEXEC is not set 286# CONFIG_KEXEC is not set
256# CONFIG_CRASH_DUMP is not set 287# CONFIG_CRASH_DUMP is not set
288CONFIG_SPARSE_IRQ=y
257CONFIG_MAX_ACTIVE_REGIONS=32 289CONFIG_MAX_ACTIVE_REGIONS=32
258CONFIG_ARCH_FLATMEM_ENABLE=y 290CONFIG_ARCH_FLATMEM_ENABLE=y
259CONFIG_ARCH_POPULATES_NODE_MAP=y 291CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -270,8 +302,6 @@ CONFIG_MIGRATION=y
270CONFIG_ZONE_DMA_FLAG=1 302CONFIG_ZONE_DMA_FLAG=1
271CONFIG_BOUNCE=y 303CONFIG_BOUNCE=y
272CONFIG_VIRT_TO_BUS=y 304CONFIG_VIRT_TO_BUS=y
273CONFIG_HAVE_MLOCK=y
274CONFIG_HAVE_MLOCKED_PAGE_BIT=y
275# CONFIG_KSM is not set 305# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 306CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277CONFIG_PPC_4K_PAGES=y 307CONFIG_PPC_4K_PAGES=y
@@ -382,6 +412,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
382CONFIG_INET6_XFRM_MODE_BEET=y 412CONFIG_INET6_XFRM_MODE_BEET=y
383# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 413# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
384CONFIG_IPV6_SIT=y 414CONFIG_IPV6_SIT=y
415# CONFIG_IPV6_SIT_6RD is not set
385CONFIG_IPV6_NDISC_NODETYPE=y 416CONFIG_IPV6_NDISC_NODETYPE=y
386# CONFIG_IPV6_TUNNEL is not set 417# CONFIG_IPV6_TUNNEL is not set
387# CONFIG_IPV6_MULTIPLE_TABLES is not set 418# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -420,9 +451,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y
420# CONFIG_AF_RXRPC is not set 451# CONFIG_AF_RXRPC is not set
421CONFIG_WIRELESS=y 452CONFIG_WIRELESS=y
422# CONFIG_CFG80211 is not set 453# CONFIG_CFG80211 is not set
423CONFIG_CFG80211_DEFAULT_PS_VALUE=0
424CONFIG_WIRELESS_OLD_REGULATORY=y
425# CONFIG_WIRELESS_EXT is not set
426# CONFIG_LIB80211 is not set 454# CONFIG_LIB80211 is not set
427 455
428# 456#
@@ -555,6 +583,10 @@ CONFIG_BLK_DEV=y
555# CONFIG_BLK_DEV_COW_COMMON is not set 583# CONFIG_BLK_DEV_COW_COMMON is not set
556CONFIG_BLK_DEV_LOOP=y 584CONFIG_BLK_DEV_LOOP=y
557# CONFIG_BLK_DEV_CRYPTOLOOP is not set 585# CONFIG_BLK_DEV_CRYPTOLOOP is not set
586
587#
588# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
589#
558# CONFIG_BLK_DEV_NBD is not set 590# CONFIG_BLK_DEV_NBD is not set
559# CONFIG_BLK_DEV_SX8 is not set 591# CONFIG_BLK_DEV_SX8 is not set
560CONFIG_BLK_DEV_RAM=y 592CONFIG_BLK_DEV_RAM=y
@@ -565,6 +597,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
565# CONFIG_ATA_OVER_ETH is not set 597# CONFIG_ATA_OVER_ETH is not set
566# CONFIG_BLK_DEV_HD is not set 598# CONFIG_BLK_DEV_HD is not set
567CONFIG_MISC_DEVICES=y 599CONFIG_MISC_DEVICES=y
600# CONFIG_AD525X_DPOT is not set
568# CONFIG_PHANTOM is not set 601# CONFIG_PHANTOM is not set
569# CONFIG_SGI_IOC4 is not set 602# CONFIG_SGI_IOC4 is not set
570# CONFIG_TIFM_CORE is not set 603# CONFIG_TIFM_CORE is not set
@@ -572,6 +605,7 @@ CONFIG_MISC_DEVICES=y
572# CONFIG_ENCLOSURE_SERVICES is not set 605# CONFIG_ENCLOSURE_SERVICES is not set
573# CONFIG_HP_ILO is not set 606# CONFIG_HP_ILO is not set
574# CONFIG_ISL29003 is not set 607# CONFIG_ISL29003 is not set
608# CONFIG_DS1682 is not set
575# CONFIG_C2PORT is not set 609# CONFIG_C2PORT is not set
576 610
577# 611#
@@ -671,7 +705,9 @@ CONFIG_SCSI_LOWLEVEL=y
671# CONFIG_SCSI_BNX2_ISCSI is not set 705# CONFIG_SCSI_BNX2_ISCSI is not set
672# CONFIG_BE2ISCSI is not set 706# CONFIG_BE2ISCSI is not set
673# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 707# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
708# CONFIG_SCSI_HPSA is not set
674# CONFIG_SCSI_3W_9XXX is not set 709# CONFIG_SCSI_3W_9XXX is not set
710# CONFIG_SCSI_3W_SAS is not set
675# CONFIG_SCSI_ACARD is not set 711# CONFIG_SCSI_ACARD is not set
676# CONFIG_SCSI_AACRAID is not set 712# CONFIG_SCSI_AACRAID is not set
677# CONFIG_SCSI_AIC7XXX is not set 713# CONFIG_SCSI_AIC7XXX is not set
@@ -710,6 +746,7 @@ CONFIG_SCSI_LOWLEVEL=y
710# CONFIG_SCSI_NSP32 is not set 746# CONFIG_SCSI_NSP32 is not set
711# CONFIG_SCSI_DEBUG is not set 747# CONFIG_SCSI_DEBUG is not set
712# CONFIG_SCSI_PMCRAID is not set 748# CONFIG_SCSI_PMCRAID is not set
749# CONFIG_SCSI_PM8001 is not set
713# CONFIG_SCSI_SRP is not set 750# CONFIG_SCSI_SRP is not set
714# CONFIG_SCSI_BFA_FC is not set 751# CONFIG_SCSI_BFA_FC is not set
715# CONFIG_SCSI_DH is not set 752# CONFIG_SCSI_DH is not set
@@ -765,15 +802,16 @@ CONFIG_PATA_ALI=y
765# CONFIG_PATA_NS87415 is not set 802# CONFIG_PATA_NS87415 is not set
766# CONFIG_PATA_OPTI is not set 803# CONFIG_PATA_OPTI is not set
767# CONFIG_PATA_OPTIDMA is not set 804# CONFIG_PATA_OPTIDMA is not set
805# CONFIG_PATA_PDC2027X is not set
768# CONFIG_PATA_PDC_OLD is not set 806# CONFIG_PATA_PDC_OLD is not set
769# CONFIG_PATA_RADISYS is not set 807# CONFIG_PATA_RADISYS is not set
770# CONFIG_PATA_RDC is not set 808# CONFIG_PATA_RDC is not set
771# CONFIG_PATA_RZ1000 is not set 809# CONFIG_PATA_RZ1000 is not set
772# CONFIG_PATA_SC1200 is not set 810# CONFIG_PATA_SC1200 is not set
773# CONFIG_PATA_SERVERWORKS is not set 811# CONFIG_PATA_SERVERWORKS is not set
774# CONFIG_PATA_PDC2027X is not set
775# CONFIG_PATA_SIL680 is not set 812# CONFIG_PATA_SIL680 is not set
776# CONFIG_PATA_SIS is not set 813# CONFIG_PATA_SIS is not set
814# CONFIG_PATA_TOSHIBA is not set
777# CONFIG_PATA_VIA is not set 815# CONFIG_PATA_VIA is not set
778# CONFIG_PATA_WINBOND is not set 816# CONFIG_PATA_WINBOND is not set
779# CONFIG_PATA_PLATFORM is not set 817# CONFIG_PATA_PLATFORM is not set
@@ -790,7 +828,7 @@ CONFIG_PATA_ALI=y
790# 828#
791 829
792# 830#
793# See the help texts for more information. 831# The newer stack is recommended.
794# 832#
795# CONFIG_FIREWIRE is not set 833# CONFIG_FIREWIRE is not set
796# CONFIG_IEEE1394 is not set 834# CONFIG_IEEE1394 is not set
@@ -838,8 +876,10 @@ CONFIG_ULI526X=y
838# CONFIG_NETDEV_10000 is not set 876# CONFIG_NETDEV_10000 is not set
839# CONFIG_TR is not set 877# CONFIG_TR is not set
840CONFIG_WLAN=y 878CONFIG_WLAN=y
841# CONFIG_WLAN_PRE80211 is not set 879# CONFIG_AIRO is not set
842# CONFIG_WLAN_80211 is not set 880# CONFIG_ATMEL is not set
881# CONFIG_PRISM54 is not set
882# CONFIG_HOSTAP is not set
843 883
844# 884#
845# Enable WiMAX (Networking options) to see the WiMAX drivers 885# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -853,6 +893,7 @@ CONFIG_WLAN=y
853# CONFIG_NETCONSOLE is not set 893# CONFIG_NETCONSOLE is not set
854# CONFIG_NETPOLL is not set 894# CONFIG_NETPOLL is not set
855# CONFIG_NET_POLL_CONTROLLER is not set 895# CONFIG_NET_POLL_CONTROLLER is not set
896# CONFIG_VMXNET3 is not set
856# CONFIG_ISDN is not set 897# CONFIG_ISDN is not set
857# CONFIG_PHONE is not set 898# CONFIG_PHONE is not set
858 899
@@ -862,6 +903,7 @@ CONFIG_WLAN=y
862CONFIG_INPUT=y 903CONFIG_INPUT=y
863# CONFIG_INPUT_FF_MEMLESS is not set 904# CONFIG_INPUT_FF_MEMLESS is not set
864# CONFIG_INPUT_POLLDEV is not set 905# CONFIG_INPUT_POLLDEV is not set
906# CONFIG_INPUT_SPARSEKMAP is not set
865 907
866# 908#
867# Userland interfaces 909# Userland interfaces
@@ -891,6 +933,7 @@ CONFIG_SERIO_SERPORT=y
891CONFIG_SERIO_LIBPS2=y 933CONFIG_SERIO_LIBPS2=y
892# CONFIG_SERIO_RAW is not set 934# CONFIG_SERIO_RAW is not set
893# CONFIG_SERIO_XILINX_XPS_PS2 is not set 935# CONFIG_SERIO_XILINX_XPS_PS2 is not set
936# CONFIG_SERIO_ALTERA_PS2 is not set
894# CONFIG_GAMEPORT is not set 937# CONFIG_GAMEPORT is not set
895 938
896# 939#
@@ -927,6 +970,7 @@ CONFIG_SERIAL_CORE=y
927CONFIG_SERIAL_CORE_CONSOLE=y 970CONFIG_SERIAL_CORE_CONSOLE=y
928# CONFIG_SERIAL_JSM is not set 971# CONFIG_SERIAL_JSM is not set
929# CONFIG_SERIAL_OF_PLATFORM is not set 972# CONFIG_SERIAL_OF_PLATFORM is not set
973# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
930CONFIG_UNIX98_PTYS=y 974CONFIG_UNIX98_PTYS=y
931# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 975# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
932# CONFIG_LEGACY_PTYS is not set 976# CONFIG_LEGACY_PTYS is not set
@@ -981,11 +1025,6 @@ CONFIG_I2C_MPC=y
981# CONFIG_I2C_TAOS_EVM is not set 1025# CONFIG_I2C_TAOS_EVM is not set
982 1026
983# 1027#
984# Graphics adapter I2C/DDC channel drivers
985#
986# CONFIG_I2C_VOODOO3 is not set
987
988#
989# Other I2C/SMBus bus drivers 1028# Other I2C/SMBus bus drivers
990# 1029#
991# CONFIG_I2C_PCA_PLATFORM is not set 1030# CONFIG_I2C_PCA_PLATFORM is not set
@@ -994,7 +1033,6 @@ CONFIG_I2C_MPC=y
994# 1033#
995# Miscellaneous I2C Chip support 1034# Miscellaneous I2C Chip support
996# 1035#
997# CONFIG_DS1682 is not set
998# CONFIG_SENSORS_TSL2550 is not set 1036# CONFIG_SENSORS_TSL2550 is not set
999# CONFIG_I2C_DEBUG_CORE is not set 1037# CONFIG_I2C_DEBUG_CORE is not set
1000# CONFIG_I2C_DEBUG_ALGO is not set 1038# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1029,11 +1067,13 @@ CONFIG_SSB_POSSIBLE=y
1029# CONFIG_TWL4030_CORE is not set 1067# CONFIG_TWL4030_CORE is not set
1030# CONFIG_MFD_TMIO is not set 1068# CONFIG_MFD_TMIO is not set
1031# CONFIG_PMIC_DA903X is not set 1069# CONFIG_PMIC_DA903X is not set
1070# CONFIG_PMIC_ADP5520 is not set
1032# CONFIG_MFD_WM8400 is not set 1071# CONFIG_MFD_WM8400 is not set
1033# CONFIG_MFD_WM831X is not set 1072# CONFIG_MFD_WM831X is not set
1034# CONFIG_MFD_WM8350_I2C is not set 1073# CONFIG_MFD_WM8350_I2C is not set
1035# CONFIG_MFD_PCF50633 is not set 1074# CONFIG_MFD_PCF50633 is not set
1036# CONFIG_AB3100_CORE is not set 1075# CONFIG_AB3100_CORE is not set
1076# CONFIG_MFD_88PM8607 is not set
1037# CONFIG_REGULATOR is not set 1077# CONFIG_REGULATOR is not set
1038# CONFIG_MEDIA_SUPPORT is not set 1078# CONFIG_MEDIA_SUPPORT is not set
1039 1079
@@ -1163,6 +1203,7 @@ CONFIG_SND_PCI=y
1163# CONFIG_SND_CS4281 is not set 1203# CONFIG_SND_CS4281 is not set
1164# CONFIG_SND_CS46XX is not set 1204# CONFIG_SND_CS46XX is not set
1165# CONFIG_SND_CS5530 is not set 1205# CONFIG_SND_CS5530 is not set
1206# CONFIG_SND_CS5535AUDIO is not set
1166# CONFIG_SND_CTXFI is not set 1207# CONFIG_SND_CTXFI is not set
1167# CONFIG_SND_DARLA20 is not set 1208# CONFIG_SND_DARLA20 is not set
1168# CONFIG_SND_GINA20 is not set 1209# CONFIG_SND_GINA20 is not set
@@ -1282,6 +1323,7 @@ CONFIG_RTC_INTF_DEV=y
1282# CONFIG_RTC_DRV_PCF8563 is not set 1323# CONFIG_RTC_DRV_PCF8563 is not set
1283# CONFIG_RTC_DRV_PCF8583 is not set 1324# CONFIG_RTC_DRV_PCF8583 is not set
1284# CONFIG_RTC_DRV_M41T80 is not set 1325# CONFIG_RTC_DRV_M41T80 is not set
1326# CONFIG_RTC_DRV_BQ32K is not set
1285# CONFIG_RTC_DRV_S35390A is not set 1327# CONFIG_RTC_DRV_S35390A is not set
1286# CONFIG_RTC_DRV_FM3130 is not set 1328# CONFIG_RTC_DRV_FM3130 is not set
1287# CONFIG_RTC_DRV_RX8581 is not set 1329# CONFIG_RTC_DRV_RX8581 is not set
@@ -1303,7 +1345,9 @@ CONFIG_RTC_DRV_CMOS=y
1303# CONFIG_RTC_DRV_M48T86 is not set 1345# CONFIG_RTC_DRV_M48T86 is not set
1304# CONFIG_RTC_DRV_M48T35 is not set 1346# CONFIG_RTC_DRV_M48T35 is not set
1305# CONFIG_RTC_DRV_M48T59 is not set 1347# CONFIG_RTC_DRV_M48T59 is not set
1348# CONFIG_RTC_DRV_MSM6242 is not set
1306# CONFIG_RTC_DRV_BQ4802 is not set 1349# CONFIG_RTC_DRV_BQ4802 is not set
1350# CONFIG_RTC_DRV_RP5C01 is not set
1307# CONFIG_RTC_DRV_V3020 is not set 1351# CONFIG_RTC_DRV_V3020 is not set
1308 1352
1309# 1353#
@@ -1606,7 +1650,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1606# CONFIG_KEYS is not set 1650# CONFIG_KEYS is not set
1607# CONFIG_SECURITY is not set 1651# CONFIG_SECURITY is not set
1608# CONFIG_SECURITYFS is not set 1652# CONFIG_SECURITYFS is not set
1609# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1653# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1654# CONFIG_DEFAULT_SECURITY_SMACK is not set
1655# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1656CONFIG_DEFAULT_SECURITY_DAC=y
1657CONFIG_DEFAULT_SECURITY=""
1610CONFIG_CRYPTO=y 1658CONFIG_CRYPTO=y
1611 1659
1612# 1660#
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index 754a79ba74a9..727a8c8d15b5 100644
--- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:46 2009 4# Wed Jan 6 09:24:40 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -60,6 +61,8 @@ CONFIG_AUDIT_ARCH=y
60CONFIG_GENERIC_BUG=y 61CONFIG_GENERIC_BUG=y
61CONFIG_DTC=y 62CONFIG_DTC=y
62CONFIG_DEFAULT_UIMAGE=y 63CONFIG_DEFAULT_UIMAGE=y
64CONFIG_ARCH_HIBERNATION_POSSIBLE=y
65CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 66# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 67# CONFIG_PPC_DCR_MMIO is not set
65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -90,6 +93,7 @@ CONFIG_AUDIT=y
90# 93#
91CONFIG_TREE_RCU=y 94CONFIG_TREE_RCU=y
92# CONFIG_TREE_PREEMPT_RCU is not set 95# CONFIG_TREE_PREEMPT_RCU is not set
96# CONFIG_TINY_RCU is not set
93# CONFIG_RCU_TRACE is not set 97# CONFIG_RCU_TRACE is not set
94CONFIG_RCU_FANOUT=32 98CONFIG_RCU_FANOUT=32
95# CONFIG_RCU_FANOUT_EXACT is not set 99# CONFIG_RCU_FANOUT_EXACT is not set
@@ -182,14 +186,41 @@ CONFIG_LBDAF=y
182# IO Schedulers 186# IO Schedulers
183# 187#
184CONFIG_IOSCHED_NOOP=y 188CONFIG_IOSCHED_NOOP=y
185CONFIG_IOSCHED_AS=y
186CONFIG_IOSCHED_DEADLINE=y 189CONFIG_IOSCHED_DEADLINE=y
187CONFIG_IOSCHED_CFQ=y 190CONFIG_IOSCHED_CFQ=y
188# CONFIG_DEFAULT_AS is not set
189# CONFIG_DEFAULT_DEADLINE is not set 191# CONFIG_DEFAULT_DEADLINE is not set
190CONFIG_DEFAULT_CFQ=y 192CONFIG_DEFAULT_CFQ=y
191# CONFIG_DEFAULT_NOOP is not set 193# CONFIG_DEFAULT_NOOP is not set
192CONFIG_DEFAULT_IOSCHED="cfq" 194CONFIG_DEFAULT_IOSCHED="cfq"
195# CONFIG_INLINE_SPIN_TRYLOCK is not set
196# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
197# CONFIG_INLINE_SPIN_LOCK is not set
198# CONFIG_INLINE_SPIN_LOCK_BH is not set
199# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
200# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
201CONFIG_INLINE_SPIN_UNLOCK=y
202# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
203CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
204# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
205# CONFIG_INLINE_READ_TRYLOCK is not set
206# CONFIG_INLINE_READ_LOCK is not set
207# CONFIG_INLINE_READ_LOCK_BH is not set
208# CONFIG_INLINE_READ_LOCK_IRQ is not set
209# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
210CONFIG_INLINE_READ_UNLOCK=y
211# CONFIG_INLINE_READ_UNLOCK_BH is not set
212CONFIG_INLINE_READ_UNLOCK_IRQ=y
213# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
214# CONFIG_INLINE_WRITE_TRYLOCK is not set
215# CONFIG_INLINE_WRITE_LOCK is not set
216# CONFIG_INLINE_WRITE_LOCK_BH is not set
217# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
218# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
219CONFIG_INLINE_WRITE_UNLOCK=y
220# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
221CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
222# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
223CONFIG_MUTEX_SPIN_ON_OWNER=y
193# CONFIG_FREEZER is not set 224# CONFIG_FREEZER is not set
194 225
195# 226#
@@ -260,6 +291,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 291# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 292# CONFIG_CRASH_DUMP is not set
262# CONFIG_IRQ_ALL_CPUS is not set 293# CONFIG_IRQ_ALL_CPUS is not set
294CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 295CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 296CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 297CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +308,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 308CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 309CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 310CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 311# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 312CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 313CONFIG_PPC_4K_PAGES=y
@@ -395,6 +425,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
395CONFIG_INET6_XFRM_MODE_BEET=y 425CONFIG_INET6_XFRM_MODE_BEET=y
396# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 426# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
397CONFIG_IPV6_SIT=y 427CONFIG_IPV6_SIT=y
428# CONFIG_IPV6_SIT_6RD is not set
398CONFIG_IPV6_NDISC_NODETYPE=y 429CONFIG_IPV6_NDISC_NODETYPE=y
399# CONFIG_IPV6_TUNNEL is not set 430# CONFIG_IPV6_TUNNEL is not set
400# CONFIG_IPV6_MULTIPLE_TABLES is not set 431# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -439,9 +470,6 @@ CONFIG_SCTP_HMAC_MD5=y
439CONFIG_FIB_RULES=y 470CONFIG_FIB_RULES=y
440CONFIG_WIRELESS=y 471CONFIG_WIRELESS=y
441# CONFIG_CFG80211 is not set 472# CONFIG_CFG80211 is not set
442CONFIG_CFG80211_DEFAULT_PS_VALUE=0
443CONFIG_WIRELESS_OLD_REGULATORY=y
444# CONFIG_WIRELESS_EXT is not set
445# CONFIG_LIB80211 is not set 473# CONFIG_LIB80211 is not set
446 474
447# 475#
@@ -483,6 +511,10 @@ CONFIG_BLK_DEV=y
483# CONFIG_BLK_DEV_COW_COMMON is not set 511# CONFIG_BLK_DEV_COW_COMMON is not set
484CONFIG_BLK_DEV_LOOP=y 512CONFIG_BLK_DEV_LOOP=y
485# CONFIG_BLK_DEV_CRYPTOLOOP is not set 513# CONFIG_BLK_DEV_CRYPTOLOOP is not set
514
515#
516# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
517#
486CONFIG_BLK_DEV_NBD=y 518CONFIG_BLK_DEV_NBD=y
487# CONFIG_BLK_DEV_SX8 is not set 519# CONFIG_BLK_DEV_SX8 is not set
488# CONFIG_BLK_DEV_UB is not set 520# CONFIG_BLK_DEV_UB is not set
@@ -494,6 +526,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
494# CONFIG_ATA_OVER_ETH is not set 526# CONFIG_ATA_OVER_ETH is not set
495# CONFIG_BLK_DEV_HD is not set 527# CONFIG_BLK_DEV_HD is not set
496CONFIG_MISC_DEVICES=y 528CONFIG_MISC_DEVICES=y
529# CONFIG_AD525X_DPOT is not set
497# CONFIG_PHANTOM is not set 530# CONFIG_PHANTOM is not set
498# CONFIG_SGI_IOC4 is not set 531# CONFIG_SGI_IOC4 is not set
499# CONFIG_TIFM_CORE is not set 532# CONFIG_TIFM_CORE is not set
@@ -501,6 +534,7 @@ CONFIG_MISC_DEVICES=y
501# CONFIG_ENCLOSURE_SERVICES is not set 534# CONFIG_ENCLOSURE_SERVICES is not set
502# CONFIG_HP_ILO is not set 535# CONFIG_HP_ILO is not set
503# CONFIG_ISL29003 is not set 536# CONFIG_ISL29003 is not set
537# CONFIG_DS1682 is not set
504# CONFIG_C2PORT is not set 538# CONFIG_C2PORT is not set
505 539
506# 540#
@@ -554,7 +588,9 @@ CONFIG_SCSI_LOWLEVEL=y
554# CONFIG_SCSI_BNX2_ISCSI is not set 588# CONFIG_SCSI_BNX2_ISCSI is not set
555# CONFIG_BE2ISCSI is not set 589# CONFIG_BE2ISCSI is not set
556# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 590# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
591# CONFIG_SCSI_HPSA is not set
557# CONFIG_SCSI_3W_9XXX is not set 592# CONFIG_SCSI_3W_9XXX is not set
593# CONFIG_SCSI_3W_SAS is not set
558# CONFIG_SCSI_ACARD is not set 594# CONFIG_SCSI_ACARD is not set
559# CONFIG_SCSI_AACRAID is not set 595# CONFIG_SCSI_AACRAID is not set
560# CONFIG_SCSI_AIC7XXX is not set 596# CONFIG_SCSI_AIC7XXX is not set
@@ -593,6 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y
593# CONFIG_SCSI_NSP32 is not set 629# CONFIG_SCSI_NSP32 is not set
594# CONFIG_SCSI_DEBUG is not set 630# CONFIG_SCSI_DEBUG is not set
595# CONFIG_SCSI_PMCRAID is not set 631# CONFIG_SCSI_PMCRAID is not set
632# CONFIG_SCSI_PM8001 is not set
596# CONFIG_SCSI_SRP is not set 633# CONFIG_SCSI_SRP is not set
597# CONFIG_SCSI_BFA_FC is not set 634# CONFIG_SCSI_BFA_FC is not set
598# CONFIG_SCSI_DH is not set 635# CONFIG_SCSI_DH is not set
@@ -648,15 +685,16 @@ CONFIG_PATA_ALI=y
648# CONFIG_PATA_NS87415 is not set 685# CONFIG_PATA_NS87415 is not set
649# CONFIG_PATA_OPTI is not set 686# CONFIG_PATA_OPTI is not set
650# CONFIG_PATA_OPTIDMA is not set 687# CONFIG_PATA_OPTIDMA is not set
688# CONFIG_PATA_PDC2027X is not set
651# CONFIG_PATA_PDC_OLD is not set 689# CONFIG_PATA_PDC_OLD is not set
652# CONFIG_PATA_RADISYS is not set 690# CONFIG_PATA_RADISYS is not set
653# CONFIG_PATA_RDC is not set 691# CONFIG_PATA_RDC is not set
654# CONFIG_PATA_RZ1000 is not set 692# CONFIG_PATA_RZ1000 is not set
655# CONFIG_PATA_SC1200 is not set 693# CONFIG_PATA_SC1200 is not set
656# CONFIG_PATA_SERVERWORKS is not set 694# CONFIG_PATA_SERVERWORKS is not set
657# CONFIG_PATA_PDC2027X is not set
658# CONFIG_PATA_SIL680 is not set 695# CONFIG_PATA_SIL680 is not set
659# CONFIG_PATA_SIS is not set 696# CONFIG_PATA_SIS is not set
697# CONFIG_PATA_TOSHIBA is not set
660# CONFIG_PATA_VIA is not set 698# CONFIG_PATA_VIA is not set
661# CONFIG_PATA_WINBOND is not set 699# CONFIG_PATA_WINBOND is not set
662# CONFIG_PATA_PLATFORM is not set 700# CONFIG_PATA_PLATFORM is not set
@@ -673,7 +711,7 @@ CONFIG_PATA_ALI=y
673# 711#
674 712
675# 713#
676# See the help texts for more information. 714# The newer stack is recommended.
677# 715#
678# CONFIG_FIREWIRE is not set 716# CONFIG_FIREWIRE is not set
679# CONFIG_IEEE1394 is not set 717# CONFIG_IEEE1394 is not set
@@ -778,8 +816,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
778# CONFIG_BE2NET is not set 816# CONFIG_BE2NET is not set
779# CONFIG_TR is not set 817# CONFIG_TR is not set
780CONFIG_WLAN=y 818CONFIG_WLAN=y
781# CONFIG_WLAN_PRE80211 is not set 819# CONFIG_AIRO is not set
782# CONFIG_WLAN_80211 is not set 820# CONFIG_ATMEL is not set
821# CONFIG_PRISM54 is not set
822# CONFIG_USB_ZD1201 is not set
823# CONFIG_HOSTAP is not set
783 824
784# 825#
785# Enable WiMAX (Networking options) to see the WiMAX drivers 826# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -802,6 +843,7 @@ CONFIG_WLAN=y
802# CONFIG_NETCONSOLE is not set 843# CONFIG_NETCONSOLE is not set
803# CONFIG_NETPOLL is not set 844# CONFIG_NETPOLL is not set
804# CONFIG_NET_POLL_CONTROLLER is not set 845# CONFIG_NET_POLL_CONTROLLER is not set
846# CONFIG_VMXNET3 is not set
805# CONFIG_ISDN is not set 847# CONFIG_ISDN is not set
806# CONFIG_PHONE is not set 848# CONFIG_PHONE is not set
807 849
@@ -811,6 +853,7 @@ CONFIG_WLAN=y
811CONFIG_INPUT=y 853CONFIG_INPUT=y
812CONFIG_INPUT_FF_MEMLESS=m 854CONFIG_INPUT_FF_MEMLESS=m
813# CONFIG_INPUT_POLLDEV is not set 855# CONFIG_INPUT_POLLDEV is not set
856# CONFIG_INPUT_SPARSEKMAP is not set
814 857
815# 858#
816# Userland interfaces 859# Userland interfaces
@@ -840,6 +883,7 @@ CONFIG_SERIO_SERPORT=y
840CONFIG_SERIO_LIBPS2=y 883CONFIG_SERIO_LIBPS2=y
841# CONFIG_SERIO_RAW is not set 884# CONFIG_SERIO_RAW is not set
842# CONFIG_SERIO_XILINX_XPS_PS2 is not set 885# CONFIG_SERIO_XILINX_XPS_PS2 is not set
886# CONFIG_SERIO_ALTERA_PS2 is not set
843# CONFIG_GAMEPORT is not set 887# CONFIG_GAMEPORT is not set
844 888
845# 889#
@@ -876,6 +920,7 @@ CONFIG_SERIAL_CORE=y
876CONFIG_SERIAL_CORE_CONSOLE=y 920CONFIG_SERIAL_CORE_CONSOLE=y
877# CONFIG_SERIAL_JSM is not set 921# CONFIG_SERIAL_JSM is not set
878# CONFIG_SERIAL_OF_PLATFORM is not set 922# CONFIG_SERIAL_OF_PLATFORM is not set
923# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
879CONFIG_UNIX98_PTYS=y 924CONFIG_UNIX98_PTYS=y
880# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 925# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
881CONFIG_LEGACY_PTYS=y 926CONFIG_LEGACY_PTYS=y
@@ -932,11 +977,6 @@ CONFIG_I2C_MPC=y
932# CONFIG_I2C_TINY_USB is not set 977# CONFIG_I2C_TINY_USB is not set
933 978
934# 979#
935# Graphics adapter I2C/DDC channel drivers
936#
937# CONFIG_I2C_VOODOO3 is not set
938
939#
940# Other I2C/SMBus bus drivers 980# Other I2C/SMBus bus drivers
941# 981#
942# CONFIG_I2C_PCA_PLATFORM is not set 982# CONFIG_I2C_PCA_PLATFORM is not set
@@ -945,7 +985,6 @@ CONFIG_I2C_MPC=y
945# 985#
946# Miscellaneous I2C Chip support 986# Miscellaneous I2C Chip support
947# 987#
948# CONFIG_DS1682 is not set
949# CONFIG_SENSORS_TSL2550 is not set 988# CONFIG_SENSORS_TSL2550 is not set
950# CONFIG_I2C_DEBUG_CORE is not set 989# CONFIG_I2C_DEBUG_CORE is not set
951# CONFIG_I2C_DEBUG_ALGO is not set 990# CONFIG_I2C_DEBUG_ALGO is not set
@@ -980,11 +1019,13 @@ CONFIG_SSB_POSSIBLE=y
980# CONFIG_TWL4030_CORE is not set 1019# CONFIG_TWL4030_CORE is not set
981# CONFIG_MFD_TMIO is not set 1020# CONFIG_MFD_TMIO is not set
982# CONFIG_PMIC_DA903X is not set 1021# CONFIG_PMIC_DA903X is not set
1022# CONFIG_PMIC_ADP5520 is not set
983# CONFIG_MFD_WM8400 is not set 1023# CONFIG_MFD_WM8400 is not set
984# CONFIG_MFD_WM831X is not set 1024# CONFIG_MFD_WM831X is not set
985# CONFIG_MFD_WM8350_I2C is not set 1025# CONFIG_MFD_WM8350_I2C is not set
986# CONFIG_MFD_PCF50633 is not set 1026# CONFIG_MFD_PCF50633 is not set
987# CONFIG_AB3100_CORE is not set 1027# CONFIG_AB3100_CORE is not set
1028# CONFIG_MFD_88PM8607 is not set
988# CONFIG_REGULATOR is not set 1029# CONFIG_REGULATOR is not set
989# CONFIG_MEDIA_SUPPORT is not set 1030# CONFIG_MEDIA_SUPPORT is not set
990 1031
@@ -1059,6 +1100,7 @@ CONFIG_SND_PCI=y
1059# CONFIG_SND_CS4281 is not set 1100# CONFIG_SND_CS4281 is not set
1060# CONFIG_SND_CS46XX is not set 1101# CONFIG_SND_CS46XX is not set
1061# CONFIG_SND_CS5530 is not set 1102# CONFIG_SND_CS5530 is not set
1103# CONFIG_SND_CS5535AUDIO is not set
1062# CONFIG_SND_CTXFI is not set 1104# CONFIG_SND_CTXFI is not set
1063# CONFIG_SND_DARLA20 is not set 1105# CONFIG_SND_DARLA20 is not set
1064# CONFIG_SND_GINA20 is not set 1106# CONFIG_SND_GINA20 is not set
@@ -1186,6 +1228,7 @@ CONFIG_USB_MON=y
1186CONFIG_USB_EHCI_HCD=y 1228CONFIG_USB_EHCI_HCD=y
1187# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1229# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1188# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1230# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1231# CONFIG_XPS_USB_HCD_XILINX is not set
1189# CONFIG_USB_EHCI_FSL is not set 1232# CONFIG_USB_EHCI_FSL is not set
1190CONFIG_USB_EHCI_HCD_PPC_OF=y 1233CONFIG_USB_EHCI_HCD_PPC_OF=y
1191# CONFIG_USB_OXU210HP_HCD is not set 1234# CONFIG_USB_OXU210HP_HCD is not set
@@ -1312,6 +1355,7 @@ CONFIG_RTC_INTF_DEV=y
1312# CONFIG_RTC_DRV_PCF8563 is not set 1355# CONFIG_RTC_DRV_PCF8563 is not set
1313# CONFIG_RTC_DRV_PCF8583 is not set 1356# CONFIG_RTC_DRV_PCF8583 is not set
1314# CONFIG_RTC_DRV_M41T80 is not set 1357# CONFIG_RTC_DRV_M41T80 is not set
1358# CONFIG_RTC_DRV_BQ32K is not set
1315# CONFIG_RTC_DRV_S35390A is not set 1359# CONFIG_RTC_DRV_S35390A is not set
1316# CONFIG_RTC_DRV_FM3130 is not set 1360# CONFIG_RTC_DRV_FM3130 is not set
1317# CONFIG_RTC_DRV_RX8581 is not set 1361# CONFIG_RTC_DRV_RX8581 is not set
@@ -1333,7 +1377,9 @@ CONFIG_RTC_DRV_CMOS=y
1333# CONFIG_RTC_DRV_M48T86 is not set 1377# CONFIG_RTC_DRV_M48T86 is not set
1334# CONFIG_RTC_DRV_M48T35 is not set 1378# CONFIG_RTC_DRV_M48T35 is not set
1335# CONFIG_RTC_DRV_M48T59 is not set 1379# CONFIG_RTC_DRV_M48T59 is not set
1380# CONFIG_RTC_DRV_MSM6242 is not set
1336# CONFIG_RTC_DRV_BQ4802 is not set 1381# CONFIG_RTC_DRV_BQ4802 is not set
1382# CONFIG_RTC_DRV_RP5C01 is not set
1337# CONFIG_RTC_DRV_V3020 is not set 1383# CONFIG_RTC_DRV_V3020 is not set
1338 1384
1339# 1385#
@@ -1648,7 +1694,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1648# CONFIG_KEYS is not set 1694# CONFIG_KEYS is not set
1649# CONFIG_SECURITY is not set 1695# CONFIG_SECURITY is not set
1650# CONFIG_SECURITYFS is not set 1696# CONFIG_SECURITYFS is not set
1651# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1697# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1698# CONFIG_DEFAULT_SECURITY_SMACK is not set
1699# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1700CONFIG_DEFAULT_SECURITY_DAC=y
1701CONFIG_DEFAULT_SECURITY=""
1652CONFIG_CRYPTO=y 1702CONFIG_CRYPTO=y
1653 1703
1654# 1704#
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index 89991f157ae8..4fb04dd2cde3 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:45 2009 4# Wed Jan 6 09:24:38 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -90,6 +93,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
90# 93#
91CONFIG_TREE_RCU=y 94CONFIG_TREE_RCU=y
92# CONFIG_TREE_PREEMPT_RCU is not set 95# CONFIG_TREE_PREEMPT_RCU is not set
96# CONFIG_TINY_RCU is not set
93# CONFIG_RCU_TRACE is not set 97# CONFIG_RCU_TRACE is not set
94CONFIG_RCU_FANOUT=32 98CONFIG_RCU_FANOUT=32
95# CONFIG_RCU_FANOUT_EXACT is not set 99# CONFIG_RCU_FANOUT_EXACT is not set
@@ -162,6 +166,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y
162# 166#
163# CONFIG_GCOV_KERNEL is not set 167# CONFIG_GCOV_KERNEL is not set
164CONFIG_SLOW_WORK=y 168CONFIG_SLOW_WORK=y
169# CONFIG_SLOW_WORK_DEBUG is not set
165# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 170# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
166CONFIG_SLABINFO=y 171CONFIG_SLABINFO=y
167CONFIG_RT_MUTEXES=y 172CONFIG_RT_MUTEXES=y
@@ -182,14 +187,41 @@ CONFIG_LBDAF=y
182# IO Schedulers 187# IO Schedulers
183# 188#
184CONFIG_IOSCHED_NOOP=y 189CONFIG_IOSCHED_NOOP=y
185CONFIG_IOSCHED_AS=y
186CONFIG_IOSCHED_DEADLINE=y 190CONFIG_IOSCHED_DEADLINE=y
187CONFIG_IOSCHED_CFQ=y 191CONFIG_IOSCHED_CFQ=y
188# CONFIG_DEFAULT_AS is not set
189# CONFIG_DEFAULT_DEADLINE is not set 192# CONFIG_DEFAULT_DEADLINE is not set
190CONFIG_DEFAULT_CFQ=y 193CONFIG_DEFAULT_CFQ=y
191# CONFIG_DEFAULT_NOOP is not set 194# CONFIG_DEFAULT_NOOP is not set
192CONFIG_DEFAULT_IOSCHED="cfq" 195CONFIG_DEFAULT_IOSCHED="cfq"
196# CONFIG_INLINE_SPIN_TRYLOCK is not set
197# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK is not set
199# CONFIG_INLINE_SPIN_LOCK_BH is not set
200# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
201# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
202# CONFIG_INLINE_SPIN_UNLOCK is not set
203# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
204# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
205# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
206# CONFIG_INLINE_READ_TRYLOCK is not set
207# CONFIG_INLINE_READ_LOCK is not set
208# CONFIG_INLINE_READ_LOCK_BH is not set
209# CONFIG_INLINE_READ_LOCK_IRQ is not set
210# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
211# CONFIG_INLINE_READ_UNLOCK is not set
212# CONFIG_INLINE_READ_UNLOCK_BH is not set
213# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
214# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
215# CONFIG_INLINE_WRITE_TRYLOCK is not set
216# CONFIG_INLINE_WRITE_LOCK is not set
217# CONFIG_INLINE_WRITE_LOCK_BH is not set
218# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
219# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
220# CONFIG_INLINE_WRITE_UNLOCK is not set
221# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
222# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
223# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
224CONFIG_MUTEX_SPIN_ON_OWNER=y
193# CONFIG_FREEZER is not set 225# CONFIG_FREEZER is not set
194 226
195# 227#
@@ -260,6 +292,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
260# CONFIG_KEXEC is not set 292# CONFIG_KEXEC is not set
261# CONFIG_CRASH_DUMP is not set 293# CONFIG_CRASH_DUMP is not set
262CONFIG_IRQ_ALL_CPUS=y 294CONFIG_IRQ_ALL_CPUS=y
295CONFIG_SPARSE_IRQ=y
263CONFIG_MAX_ACTIVE_REGIONS=32 296CONFIG_MAX_ACTIVE_REGIONS=32
264CONFIG_ARCH_FLATMEM_ENABLE=y 297CONFIG_ARCH_FLATMEM_ENABLE=y
265CONFIG_ARCH_POPULATES_NODE_MAP=y 298CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -276,8 +309,6 @@ CONFIG_MIGRATION=y
276CONFIG_ZONE_DMA_FLAG=1 309CONFIG_ZONE_DMA_FLAG=1
277CONFIG_BOUNCE=y 310CONFIG_BOUNCE=y
278CONFIG_VIRT_TO_BUS=y 311CONFIG_VIRT_TO_BUS=y
279CONFIG_HAVE_MLOCK=y
280CONFIG_HAVE_MLOCKED_PAGE_BIT=y
281# CONFIG_KSM is not set 312# CONFIG_KSM is not set
282CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 313CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
283CONFIG_PPC_4K_PAGES=y 314CONFIG_PPC_4K_PAGES=y
@@ -399,6 +430,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
399CONFIG_INET6_XFRM_MODE_BEET=m 430CONFIG_INET6_XFRM_MODE_BEET=m
400# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 431# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
401CONFIG_IPV6_SIT=m 432CONFIG_IPV6_SIT=m
433# CONFIG_IPV6_SIT_6RD is not set
402CONFIG_IPV6_NDISC_NODETYPE=y 434CONFIG_IPV6_NDISC_NODETYPE=y
403CONFIG_IPV6_TUNNEL=m 435CONFIG_IPV6_TUNNEL=m
404# CONFIG_IPV6_MULTIPLE_TABLES is not set 436# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -587,9 +619,6 @@ CONFIG_NET_PKTGEN=m
587CONFIG_FIB_RULES=y 619CONFIG_FIB_RULES=y
588CONFIG_WIRELESS=y 620CONFIG_WIRELESS=y
589# CONFIG_CFG80211 is not set 621# CONFIG_CFG80211 is not set
590CONFIG_CFG80211_DEFAULT_PS_VALUE=0
591CONFIG_WIRELESS_OLD_REGULATORY=y
592# CONFIG_WIRELESS_EXT is not set
593# CONFIG_LIB80211 is not set 622# CONFIG_LIB80211 is not set
594 623
595# 624#
@@ -717,6 +746,10 @@ CONFIG_BLK_DEV=y
717# CONFIG_BLK_DEV_COW_COMMON is not set 746# CONFIG_BLK_DEV_COW_COMMON is not set
718CONFIG_BLK_DEV_LOOP=m 747CONFIG_BLK_DEV_LOOP=m
719CONFIG_BLK_DEV_CRYPTOLOOP=m 748CONFIG_BLK_DEV_CRYPTOLOOP=m
749
750#
751# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
752#
720CONFIG_BLK_DEV_NBD=m 753CONFIG_BLK_DEV_NBD=m
721# CONFIG_BLK_DEV_SX8 is not set 754# CONFIG_BLK_DEV_SX8 is not set
722CONFIG_BLK_DEV_RAM=y 755CONFIG_BLK_DEV_RAM=y
@@ -727,6 +760,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
727# CONFIG_ATA_OVER_ETH is not set 760# CONFIG_ATA_OVER_ETH is not set
728# CONFIG_BLK_DEV_HD is not set 761# CONFIG_BLK_DEV_HD is not set
729CONFIG_MISC_DEVICES=y 762CONFIG_MISC_DEVICES=y
763# CONFIG_AD525X_DPOT is not set
730# CONFIG_PHANTOM is not set 764# CONFIG_PHANTOM is not set
731# CONFIG_SGI_IOC4 is not set 765# CONFIG_SGI_IOC4 is not set
732# CONFIG_TIFM_CORE is not set 766# CONFIG_TIFM_CORE is not set
@@ -734,6 +768,7 @@ CONFIG_MISC_DEVICES=y
734# CONFIG_ENCLOSURE_SERVICES is not set 768# CONFIG_ENCLOSURE_SERVICES is not set
735# CONFIG_HP_ILO is not set 769# CONFIG_HP_ILO is not set
736# CONFIG_ISL29003 is not set 770# CONFIG_ISL29003 is not set
771# CONFIG_DS1682 is not set
737# CONFIG_C2PORT is not set 772# CONFIG_C2PORT is not set
738 773
739# 774#
@@ -786,7 +821,7 @@ CONFIG_DM_ZERO=y
786# 821#
787 822
788# 823#
789# See the help texts for more information. 824# The newer stack is recommended.
790# 825#
791# CONFIG_FIREWIRE is not set 826# CONFIG_FIREWIRE is not set
792# CONFIG_IEEE1394 is not set 827# CONFIG_IEEE1394 is not set
@@ -873,8 +908,10 @@ CONFIG_GIANFAR=y
873# CONFIG_NETDEV_10000 is not set 908# CONFIG_NETDEV_10000 is not set
874# CONFIG_TR is not set 909# CONFIG_TR is not set
875CONFIG_WLAN=y 910CONFIG_WLAN=y
876# CONFIG_WLAN_PRE80211 is not set 911# CONFIG_AIRO is not set
877# CONFIG_WLAN_80211 is not set 912# CONFIG_ATMEL is not set
913# CONFIG_PRISM54 is not set
914# CONFIG_HOSTAP is not set
878 915
879# 916#
880# Enable WiMAX (Networking options) to see the WiMAX drivers 917# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -918,6 +955,7 @@ CONFIG_NETCONSOLE=y
918CONFIG_NETPOLL=y 955CONFIG_NETPOLL=y
919CONFIG_NETPOLL_TRAP=y 956CONFIG_NETPOLL_TRAP=y
920CONFIG_NET_POLL_CONTROLLER=y 957CONFIG_NET_POLL_CONTROLLER=y
958# CONFIG_VMXNET3 is not set
921# CONFIG_ISDN is not set 959# CONFIG_ISDN is not set
922# CONFIG_PHONE is not set 960# CONFIG_PHONE is not set
923 961
@@ -927,6 +965,7 @@ CONFIG_NET_POLL_CONTROLLER=y
927CONFIG_INPUT=y 965CONFIG_INPUT=y
928# CONFIG_INPUT_FF_MEMLESS is not set 966# CONFIG_INPUT_FF_MEMLESS is not set
929# CONFIG_INPUT_POLLDEV is not set 967# CONFIG_INPUT_POLLDEV is not set
968# CONFIG_INPUT_SPARSEKMAP is not set
930 969
931# 970#
932# Userland interfaces 971# Userland interfaces
@@ -985,6 +1024,7 @@ CONFIG_SERIAL_CORE=y
985CONFIG_SERIAL_CORE_CONSOLE=y 1024CONFIG_SERIAL_CORE_CONSOLE=y
986# CONFIG_SERIAL_JSM is not set 1025# CONFIG_SERIAL_JSM is not set
987# CONFIG_SERIAL_OF_PLATFORM is not set 1026# CONFIG_SERIAL_OF_PLATFORM is not set
1027# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
988CONFIG_UNIX98_PTYS=y 1028CONFIG_UNIX98_PTYS=y
989# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1029# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
990CONFIG_LEGACY_PTYS=y 1030CONFIG_LEGACY_PTYS=y
@@ -1042,11 +1082,6 @@ CONFIG_I2C_MPC=y
1042# CONFIG_I2C_TAOS_EVM is not set 1082# CONFIG_I2C_TAOS_EVM is not set
1043 1083
1044# 1084#
1045# Graphics adapter I2C/DDC channel drivers
1046#
1047# CONFIG_I2C_VOODOO3 is not set
1048
1049#
1050# Other I2C/SMBus bus drivers 1085# Other I2C/SMBus bus drivers
1051# 1086#
1052# CONFIG_I2C_PCA_PLATFORM is not set 1087# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1055,7 +1090,6 @@ CONFIG_I2C_MPC=y
1055# 1090#
1056# Miscellaneous I2C Chip support 1091# Miscellaneous I2C Chip support
1057# 1092#
1058# CONFIG_DS1682 is not set
1059# CONFIG_SENSORS_TSL2550 is not set 1093# CONFIG_SENSORS_TSL2550 is not set
1060# CONFIG_I2C_DEBUG_CORE is not set 1094# CONFIG_I2C_DEBUG_CORE is not set
1061# CONFIG_I2C_DEBUG_ALGO is not set 1095# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1101,6 +1135,7 @@ CONFIG_HWMON=y
1101# CONFIG_SENSORS_GL520SM is not set 1135# CONFIG_SENSORS_GL520SM is not set
1102# CONFIG_SENSORS_IT87 is not set 1136# CONFIG_SENSORS_IT87 is not set
1103# CONFIG_SENSORS_LM63 is not set 1137# CONFIG_SENSORS_LM63 is not set
1138# CONFIG_SENSORS_LM73 is not set
1104# CONFIG_SENSORS_LM75 is not set 1139# CONFIG_SENSORS_LM75 is not set
1105# CONFIG_SENSORS_LM77 is not set 1140# CONFIG_SENSORS_LM77 is not set
1106# CONFIG_SENSORS_LM78 is not set 1141# CONFIG_SENSORS_LM78 is not set
@@ -1139,6 +1174,7 @@ CONFIG_HWMON=y
1139# CONFIG_SENSORS_W83L786NG is not set 1174# CONFIG_SENSORS_W83L786NG is not set
1140# CONFIG_SENSORS_W83627HF is not set 1175# CONFIG_SENSORS_W83627HF is not set
1141# CONFIG_SENSORS_W83627EHF is not set 1176# CONFIG_SENSORS_W83627EHF is not set
1177# CONFIG_SENSORS_LIS3_I2C is not set
1142# CONFIG_THERMAL is not set 1178# CONFIG_THERMAL is not set
1143CONFIG_WATCHDOG=y 1179CONFIG_WATCHDOG=y
1144# CONFIG_WATCHDOG_NOWAYOUT is not set 1180# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1171,11 +1207,13 @@ CONFIG_SSB_POSSIBLE=y
1171# CONFIG_TWL4030_CORE is not set 1207# CONFIG_TWL4030_CORE is not set
1172# CONFIG_MFD_TMIO is not set 1208# CONFIG_MFD_TMIO is not set
1173# CONFIG_PMIC_DA903X is not set 1209# CONFIG_PMIC_DA903X is not set
1210# CONFIG_PMIC_ADP5520 is not set
1174# CONFIG_MFD_WM8400 is not set 1211# CONFIG_MFD_WM8400 is not set
1175# CONFIG_MFD_WM831X is not set 1212# CONFIG_MFD_WM831X is not set
1176# CONFIG_MFD_WM8350_I2C is not set 1213# CONFIG_MFD_WM8350_I2C is not set
1177# CONFIG_MFD_PCF50633 is not set 1214# CONFIG_MFD_PCF50633 is not set
1178# CONFIG_AB3100_CORE is not set 1215# CONFIG_AB3100_CORE is not set
1216# CONFIG_MFD_88PM8607 is not set
1179# CONFIG_REGULATOR is not set 1217# CONFIG_REGULATOR is not set
1180# CONFIG_MEDIA_SUPPORT is not set 1218# CONFIG_MEDIA_SUPPORT is not set
1181 1219
@@ -1281,7 +1319,6 @@ CONFIG_OCFS2_FS_O2CB=m
1281CONFIG_OCFS2_FS_STATS=y 1319CONFIG_OCFS2_FS_STATS=y
1282CONFIG_OCFS2_DEBUG_MASKLOG=y 1320CONFIG_OCFS2_DEBUG_MASKLOG=y
1283# CONFIG_OCFS2_DEBUG_FS is not set 1321# CONFIG_OCFS2_DEBUG_FS is not set
1284# CONFIG_OCFS2_FS_POSIX_ACL is not set
1285# CONFIG_BTRFS_FS is not set 1322# CONFIG_BTRFS_FS is not set
1286# CONFIG_NILFS2_FS is not set 1323# CONFIG_NILFS2_FS is not set
1287CONFIG_FILE_LOCKING=y 1324CONFIG_FILE_LOCKING=y
@@ -1556,8 +1593,12 @@ CONFIG_SECURITY=y
1556CONFIG_SECURITY_NETWORK=y 1593CONFIG_SECURITY_NETWORK=y
1557# CONFIG_SECURITY_NETWORK_XFRM is not set 1594# CONFIG_SECURITY_NETWORK_XFRM is not set
1558# CONFIG_SECURITY_PATH is not set 1595# CONFIG_SECURITY_PATH is not set
1559# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1560# CONFIG_SECURITY_TOMOYO is not set 1596# CONFIG_SECURITY_TOMOYO is not set
1597# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1598# CONFIG_DEFAULT_SECURITY_SMACK is not set
1599# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1600CONFIG_DEFAULT_SECURITY_DAC=y
1601CONFIG_DEFAULT_SECURITY=""
1561CONFIG_CRYPTO=y 1602CONFIG_CRYPTO=y
1562 1603
1563# 1604#
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig
index 052cf134e018..5c1dc768bbd8 100644
--- a/arch/powerpc/configs/adder875_defconfig
+++ b/arch/powerpc/configs/adder875_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:04 2009 4# Wed Jan 6 09:23:58 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -55,6 +56,7 @@ CONFIG_GENERIC_BUG=y
55CONFIG_DTC=y 56CONFIG_DTC=y
56# CONFIG_DEFAULT_UIMAGE is not set 57# CONFIG_DEFAULT_UIMAGE is not set
57CONFIG_REDBOOT=y 58CONFIG_REDBOOT=y
59CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58# CONFIG_PPC_DCR_NATIVE is not set 60# CONFIG_PPC_DCR_NATIVE is not set
59# CONFIG_PPC_DCR_MMIO is not set 61# CONFIG_PPC_DCR_MMIO is not set
60CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 62CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -82,6 +84,7 @@ CONFIG_SYSVIPC_SYSCTL=y
82# 84#
83CONFIG_TREE_RCU=y 85CONFIG_TREE_RCU=y
84# CONFIG_TREE_PREEMPT_RCU is not set 86# CONFIG_TREE_PREEMPT_RCU is not set
87# CONFIG_TINY_RCU is not set
85# CONFIG_RCU_TRACE is not set 88# CONFIG_RCU_TRACE is not set
86CONFIG_RCU_FANOUT=32 89CONFIG_RCU_FANOUT=32
87# CONFIG_RCU_FANOUT_EXACT is not set 90# CONFIG_RCU_FANOUT_EXACT is not set
@@ -161,14 +164,41 @@ CONFIG_LBDAF=y
161# IO Schedulers 164# IO Schedulers
162# 165#
163CONFIG_IOSCHED_NOOP=y 166CONFIG_IOSCHED_NOOP=y
164# CONFIG_IOSCHED_AS is not set
165CONFIG_IOSCHED_DEADLINE=y 167CONFIG_IOSCHED_DEADLINE=y
166# CONFIG_IOSCHED_CFQ is not set 168# CONFIG_IOSCHED_CFQ is not set
167# CONFIG_DEFAULT_AS is not set
168CONFIG_DEFAULT_DEADLINE=y 169CONFIG_DEFAULT_DEADLINE=y
169# CONFIG_DEFAULT_CFQ is not set 170# CONFIG_DEFAULT_CFQ is not set
170# CONFIG_DEFAULT_NOOP is not set 171# CONFIG_DEFAULT_NOOP is not set
171CONFIG_DEFAULT_IOSCHED="deadline" 172CONFIG_DEFAULT_IOSCHED="deadline"
173# CONFIG_INLINE_SPIN_TRYLOCK is not set
174# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
175# CONFIG_INLINE_SPIN_LOCK is not set
176# CONFIG_INLINE_SPIN_LOCK_BH is not set
177# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
178# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
179CONFIG_INLINE_SPIN_UNLOCK=y
180# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
181CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
182# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
183# CONFIG_INLINE_READ_TRYLOCK is not set
184# CONFIG_INLINE_READ_LOCK is not set
185# CONFIG_INLINE_READ_LOCK_BH is not set
186# CONFIG_INLINE_READ_LOCK_IRQ is not set
187# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
188CONFIG_INLINE_READ_UNLOCK=y
189# CONFIG_INLINE_READ_UNLOCK_BH is not set
190CONFIG_INLINE_READ_UNLOCK_IRQ=y
191# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_WRITE_TRYLOCK is not set
193# CONFIG_INLINE_WRITE_LOCK is not set
194# CONFIG_INLINE_WRITE_LOCK_BH is not set
195# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
196# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
197CONFIG_INLINE_WRITE_UNLOCK=y
198# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
199CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
200# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
201# CONFIG_MUTEX_SPIN_ON_OWNER is not set
172# CONFIG_FREEZER is not set 202# CONFIG_FREEZER is not set
173 203
174# 204#
@@ -242,6 +272,7 @@ CONFIG_BINFMT_ELF=y
242CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 272CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
243CONFIG_ARCH_HAS_WALK_MEMORY=y 273CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 274CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
275CONFIG_SPARSE_IRQ=y
245CONFIG_MAX_ACTIVE_REGIONS=32 276CONFIG_MAX_ACTIVE_REGIONS=32
246CONFIG_ARCH_FLATMEM_ENABLE=y 277CONFIG_ARCH_FLATMEM_ENABLE=y
247CONFIG_ARCH_POPULATES_NODE_MAP=y 278CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -258,8 +289,6 @@ CONFIG_MIGRATION=y
258CONFIG_ZONE_DMA_FLAG=1 289CONFIG_ZONE_DMA_FLAG=1
259CONFIG_BOUNCE=y 290CONFIG_BOUNCE=y
260CONFIG_VIRT_TO_BUS=y 291CONFIG_VIRT_TO_BUS=y
261CONFIG_HAVE_MLOCK=y
262CONFIG_HAVE_MLOCKED_PAGE_BIT=y
263# CONFIG_KSM is not set 292# CONFIG_KSM is not set
264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 293CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
265CONFIG_PPC_4K_PAGES=y 294CONFIG_PPC_4K_PAGES=y
@@ -373,9 +402,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_AF_RXRPC is not set 402# CONFIG_AF_RXRPC is not set
374CONFIG_WIRELESS=y 403CONFIG_WIRELESS=y
375# CONFIG_CFG80211 is not set 404# CONFIG_CFG80211 is not set
376CONFIG_CFG80211_DEFAULT_PS_VALUE=0
377CONFIG_WIRELESS_OLD_REGULATORY=y
378# CONFIG_WIRELESS_EXT is not set
379# CONFIG_LIB80211 is not set 405# CONFIG_LIB80211 is not set
380 406
381# 407#
@@ -546,8 +572,7 @@ CONFIG_FS_ENET_MDIO_FEC=y
546# CONFIG_NETDEV_1000 is not set 572# CONFIG_NETDEV_1000 is not set
547# CONFIG_NETDEV_10000 is not set 573# CONFIG_NETDEV_10000 is not set
548CONFIG_WLAN=y 574CONFIG_WLAN=y
549# CONFIG_WLAN_PRE80211 is not set 575# CONFIG_HOSTAP is not set
550# CONFIG_WLAN_80211 is not set
551 576
552# 577#
553# Enable WiMAX (Networking options) to see the WiMAX drivers 578# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -567,6 +592,7 @@ CONFIG_WLAN=y
567CONFIG_INPUT=y 592CONFIG_INPUT=y
568# CONFIG_INPUT_FF_MEMLESS is not set 593# CONFIG_INPUT_FF_MEMLESS is not set
569# CONFIG_INPUT_POLLDEV is not set 594# CONFIG_INPUT_POLLDEV is not set
595# CONFIG_INPUT_SPARSEKMAP is not set
570 596
571# 597#
572# Userland interfaces 598# Userland interfaces
@@ -615,6 +641,7 @@ CONFIG_SERIO_SERPORT=y
615CONFIG_SERIO_LIBPS2=y 641CONFIG_SERIO_LIBPS2=y
616# CONFIG_SERIO_RAW is not set 642# CONFIG_SERIO_RAW is not set
617# CONFIG_SERIO_XILINX_XPS_PS2 is not set 643# CONFIG_SERIO_XILINX_XPS_PS2 is not set
644# CONFIG_SERIO_ALTERA_PS2 is not set
618# CONFIG_GAMEPORT is not set 645# CONFIG_GAMEPORT is not set
619 646
620# 647#
@@ -637,6 +664,7 @@ CONFIG_SERIAL_CORE=y
637CONFIG_SERIAL_CORE_CONSOLE=y 664CONFIG_SERIAL_CORE_CONSOLE=y
638CONFIG_SERIAL_CPM=y 665CONFIG_SERIAL_CPM=y
639CONFIG_SERIAL_CPM_CONSOLE=y 666CONFIG_SERIAL_CPM_CONSOLE=y
667# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
640CONFIG_UNIX98_PTYS=y 668CONFIG_UNIX98_PTYS=y
641# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 669# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
642# CONFIG_LEGACY_PTYS is not set 670# CONFIG_LEGACY_PTYS is not set
@@ -898,6 +926,7 @@ CONFIG_DEBUG_INFO=y
898# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 926# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
899# CONFIG_FAULT_INJECTION is not set 927# CONFIG_FAULT_INJECTION is not set
900# CONFIG_LATENCYTOP is not set 928# CONFIG_LATENCYTOP is not set
929# CONFIG_SYSCTL_SYSCALL_CHECK is not set
901# CONFIG_DEBUG_PAGEALLOC is not set 930# CONFIG_DEBUG_PAGEALLOC is not set
902CONFIG_HAVE_FUNCTION_TRACER=y 931CONFIG_HAVE_FUNCTION_TRACER=y
903CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 932CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -943,7 +972,11 @@ CONFIG_PRINT_STACK_DEPTH=64
943# CONFIG_KEYS is not set 972# CONFIG_KEYS is not set
944# CONFIG_SECURITY is not set 973# CONFIG_SECURITY is not set
945# CONFIG_SECURITYFS is not set 974# CONFIG_SECURITYFS is not set
946# CONFIG_SECURITY_FILE_CAPABILITIES is not set 975# CONFIG_DEFAULT_SECURITY_SELINUX is not set
976# CONFIG_DEFAULT_SECURITY_SMACK is not set
977# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
978CONFIG_DEFAULT_SECURITY_DAC=y
979CONFIG_DEFAULT_SECURITY=""
947# CONFIG_CRYPTO is not set 980# CONFIG_CRYPTO is not set
948CONFIG_PPC_CLOCK=y 981CONFIG_PPC_CLOCK=y
949CONFIG_PPC_LIB_RHEAP=y 982CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 0fb65a85dfdf..72137cd881da 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:05 2009 4# Wed Jan 6 09:23:59 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,7 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63# CONFIG_DEFAULT_UIMAGE is not set 64# CONFIG_DEFAULT_UIMAGE is not set
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 66# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 67# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -92,6 +94,7 @@ CONFIG_AUDIT_TREE=y
92# 94#
93CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
94# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
95# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
96CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
97# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -173,6 +176,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y
173# 176#
174# CONFIG_GCOV_KERNEL is not set 177# CONFIG_GCOV_KERNEL is not set
175CONFIG_SLOW_WORK=y 178CONFIG_SLOW_WORK=y
179# CONFIG_SLOW_WORK_DEBUG is not set
176# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 180# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
177CONFIG_SLABINFO=y 181CONFIG_SLABINFO=y
178CONFIG_RT_MUTEXES=y 182CONFIG_RT_MUTEXES=y
@@ -192,14 +196,41 @@ CONFIG_LBDAF=y
192# IO Schedulers 196# IO Schedulers
193# 197#
194CONFIG_IOSCHED_NOOP=y 198CONFIG_IOSCHED_NOOP=y
195CONFIG_IOSCHED_AS=y
196CONFIG_IOSCHED_DEADLINE=y 199CONFIG_IOSCHED_DEADLINE=y
197CONFIG_IOSCHED_CFQ=y 200CONFIG_IOSCHED_CFQ=y
198# CONFIG_DEFAULT_AS is not set
199# CONFIG_DEFAULT_DEADLINE is not set 201# CONFIG_DEFAULT_DEADLINE is not set
200CONFIG_DEFAULT_CFQ=y 202CONFIG_DEFAULT_CFQ=y
201# CONFIG_DEFAULT_NOOP is not set 203# CONFIG_DEFAULT_NOOP is not set
202CONFIG_DEFAULT_IOSCHED="cfq" 204CONFIG_DEFAULT_IOSCHED="cfq"
205# CONFIG_INLINE_SPIN_TRYLOCK is not set
206# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
207# CONFIG_INLINE_SPIN_LOCK is not set
208# CONFIG_INLINE_SPIN_LOCK_BH is not set
209# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
210# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
211# CONFIG_INLINE_SPIN_UNLOCK is not set
212# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
213# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
214# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
215# CONFIG_INLINE_READ_TRYLOCK is not set
216# CONFIG_INLINE_READ_LOCK is not set
217# CONFIG_INLINE_READ_LOCK_BH is not set
218# CONFIG_INLINE_READ_LOCK_IRQ is not set
219# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
220# CONFIG_INLINE_READ_UNLOCK is not set
221# CONFIG_INLINE_READ_UNLOCK_BH is not set
222# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
223# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
224# CONFIG_INLINE_WRITE_TRYLOCK is not set
225# CONFIG_INLINE_WRITE_LOCK is not set
226# CONFIG_INLINE_WRITE_LOCK_BH is not set
227# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
228# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
229# CONFIG_INLINE_WRITE_UNLOCK is not set
230# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
231# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
232# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
233# CONFIG_MUTEX_SPIN_ON_OWNER is not set
203# CONFIG_FREEZER is not set 234# CONFIG_FREEZER is not set
204 235
205# 236#
@@ -224,6 +255,8 @@ CONFIG_EMBEDDED6xx=y
224# CONFIG_PPC_PRPMC2800 is not set 255# CONFIG_PPC_PRPMC2800 is not set
225CONFIG_PPC_C2K=y 256CONFIG_PPC_C2K=y
226CONFIG_MV64X60=y 257CONFIG_MV64X60=y
258# CONFIG_GAMECUBE is not set
259# CONFIG_WII is not set
227# CONFIG_AMIGAONE is not set 260# CONFIG_AMIGAONE is not set
228CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 261CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
229# CONFIG_IPIC is not set 262# CONFIG_IPIC is not set
@@ -286,6 +319,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 319CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
287# CONFIG_KEXEC is not set 320# CONFIG_KEXEC is not set
288# CONFIG_CRASH_DUMP is not set 321# CONFIG_CRASH_DUMP is not set
322CONFIG_SPARSE_IRQ=y
289CONFIG_MAX_ACTIVE_REGIONS=32 323CONFIG_MAX_ACTIVE_REGIONS=32
290CONFIG_ARCH_FLATMEM_ENABLE=y 324CONFIG_ARCH_FLATMEM_ENABLE=y
291CONFIG_ARCH_POPULATES_NODE_MAP=y 325CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -296,14 +330,12 @@ CONFIG_FLATMEM_MANUAL=y
296CONFIG_FLATMEM=y 330CONFIG_FLATMEM=y
297CONFIG_FLAT_NODE_MEM_MAP=y 331CONFIG_FLAT_NODE_MEM_MAP=y
298CONFIG_PAGEFLAGS_EXTENDED=y 332CONFIG_PAGEFLAGS_EXTENDED=y
299CONFIG_SPLIT_PTLOCK_CPUS=4 333CONFIG_SPLIT_PTLOCK_CPUS=999999
300CONFIG_MIGRATION=y 334CONFIG_MIGRATION=y
301# CONFIG_PHYS_ADDR_T_64BIT is not set 335# CONFIG_PHYS_ADDR_T_64BIT is not set
302CONFIG_ZONE_DMA_FLAG=1 336CONFIG_ZONE_DMA_FLAG=1
303CONFIG_BOUNCE=y 337CONFIG_BOUNCE=y
304CONFIG_VIRT_TO_BUS=y 338CONFIG_VIRT_TO_BUS=y
305CONFIG_HAVE_MLOCK=y
306CONFIG_HAVE_MLOCKED_PAGE_BIT=y
307# CONFIG_KSM is not set 339# CONFIG_KSM is not set
308CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 340CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
309CONFIG_PPC_4K_PAGES=y 341CONFIG_PPC_4K_PAGES=y
@@ -316,6 +348,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
316CONFIG_EXTRA_TARGETS="" 348CONFIG_EXTRA_TARGETS=""
317CONFIG_PM=y 349CONFIG_PM=y
318# CONFIG_PM_DEBUG is not set 350# CONFIG_PM_DEBUG is not set
351# CONFIG_HIBERNATION is not set
319# CONFIG_PM_RUNTIME is not set 352# CONFIG_PM_RUNTIME is not set
320CONFIG_SECCOMP=y 353CONFIG_SECCOMP=y
321CONFIG_ISA_DMA_API=y 354CONFIG_ISA_DMA_API=y
@@ -424,6 +457,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
424CONFIG_INET6_XFRM_MODE_BEET=m 457CONFIG_INET6_XFRM_MODE_BEET=m
425# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 458# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
426CONFIG_IPV6_SIT=m 459CONFIG_IPV6_SIT=m
460# CONFIG_IPV6_SIT_6RD is not set
427CONFIG_IPV6_NDISC_NODETYPE=y 461CONFIG_IPV6_NDISC_NODETYPE=y
428CONFIG_IPV6_TUNNEL=m 462CONFIG_IPV6_TUNNEL=m
429# CONFIG_IPV6_MULTIPLE_TABLES is not set 463# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -687,10 +721,6 @@ CONFIG_BT_HCIVHCI=m
687CONFIG_FIB_RULES=y 721CONFIG_FIB_RULES=y
688CONFIG_WIRELESS=y 722CONFIG_WIRELESS=y
689# CONFIG_CFG80211 is not set 723# CONFIG_CFG80211 is not set
690CONFIG_CFG80211_DEFAULT_PS_VALUE=0
691CONFIG_WIRELESS_OLD_REGULATORY=y
692CONFIG_WIRELESS_EXT=y
693CONFIG_WIRELESS_EXT_SYSFS=y
694# CONFIG_LIB80211 is not set 724# CONFIG_LIB80211 is not set
695 725
696# 726#
@@ -773,7 +803,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
773# CONFIG_MTD_PHYSMAP is not set 803# CONFIG_MTD_PHYSMAP is not set
774CONFIG_MTD_PHYSMAP_OF=y 804CONFIG_MTD_PHYSMAP_OF=y
775# CONFIG_MTD_PCI is not set 805# CONFIG_MTD_PCI is not set
776# CONFIG_MTD_GPIO_ADDR is not set
777# CONFIG_MTD_INTEL_VR_NOR is not set 806# CONFIG_MTD_INTEL_VR_NOR is not set
778# CONFIG_MTD_PLATRAM is not set 807# CONFIG_MTD_PLATRAM is not set
779 808
@@ -817,6 +846,10 @@ CONFIG_BLK_DEV=y
817# CONFIG_BLK_DEV_COW_COMMON is not set 846# CONFIG_BLK_DEV_COW_COMMON is not set
818CONFIG_BLK_DEV_LOOP=m 847CONFIG_BLK_DEV_LOOP=m
819CONFIG_BLK_DEV_CRYPTOLOOP=m 848CONFIG_BLK_DEV_CRYPTOLOOP=m
849
850#
851# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
852#
820CONFIG_BLK_DEV_NBD=m 853CONFIG_BLK_DEV_NBD=m
821# CONFIG_BLK_DEV_SX8 is not set 854# CONFIG_BLK_DEV_SX8 is not set
822# CONFIG_BLK_DEV_UB is not set 855# CONFIG_BLK_DEV_UB is not set
@@ -870,7 +903,9 @@ CONFIG_SCSI_LOWLEVEL=y
870# CONFIG_SCSI_BNX2_ISCSI is not set 903# CONFIG_SCSI_BNX2_ISCSI is not set
871# CONFIG_BE2ISCSI is not set 904# CONFIG_BE2ISCSI is not set
872CONFIG_BLK_DEV_3W_XXXX_RAID=m 905CONFIG_BLK_DEV_3W_XXXX_RAID=m
906# CONFIG_SCSI_HPSA is not set
873CONFIG_SCSI_3W_9XXX=m 907CONFIG_SCSI_3W_9XXX=m
908# CONFIG_SCSI_3W_SAS is not set
874CONFIG_SCSI_ACARD=m 909CONFIG_SCSI_ACARD=m
875CONFIG_SCSI_AACRAID=m 910CONFIG_SCSI_AACRAID=m
876CONFIG_SCSI_AIC7XXX=m 911CONFIG_SCSI_AIC7XXX=m
@@ -925,6 +960,7 @@ CONFIG_SCSI_LPFC=m
925# CONFIG_SCSI_NSP32 is not set 960# CONFIG_SCSI_NSP32 is not set
926# CONFIG_SCSI_DEBUG is not set 961# CONFIG_SCSI_DEBUG is not set
927# CONFIG_SCSI_PMCRAID is not set 962# CONFIG_SCSI_PMCRAID is not set
963# CONFIG_SCSI_PM8001 is not set
928# CONFIG_SCSI_SRP is not set 964# CONFIG_SCSI_SRP is not set
929# CONFIG_SCSI_BFA_FC is not set 965# CONFIG_SCSI_BFA_FC is not set
930# CONFIG_SCSI_DH is not set 966# CONFIG_SCSI_DH is not set
@@ -942,7 +978,7 @@ CONFIG_SCSI_LPFC=m
942# 978#
943 979
944# 980#
945# See the help texts for more information. 981# The newer stack is recommended.
946# 982#
947# CONFIG_FIREWIRE is not set 983# CONFIG_FIREWIRE is not set
948# CONFIG_IEEE1394 is not set 984# CONFIG_IEEE1394 is not set
@@ -1027,8 +1063,11 @@ CONFIG_MV643XX_ETH=y
1027# CONFIG_NETDEV_10000 is not set 1063# CONFIG_NETDEV_10000 is not set
1028# CONFIG_TR is not set 1064# CONFIG_TR is not set
1029CONFIG_WLAN=y 1065CONFIG_WLAN=y
1030# CONFIG_WLAN_PRE80211 is not set 1066# CONFIG_AIRO is not set
1031# CONFIG_WLAN_80211 is not set 1067# CONFIG_ATMEL is not set
1068# CONFIG_PRISM54 is not set
1069# CONFIG_USB_ZD1201 is not set
1070# CONFIG_HOSTAP is not set
1032 1071
1033# 1072#
1034# Enable WiMAX (Networking options) to see the WiMAX drivers 1073# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1054,6 +1093,7 @@ CONFIG_NETCONSOLE=m
1054CONFIG_NETPOLL=y 1093CONFIG_NETPOLL=y
1055CONFIG_NETPOLL_TRAP=y 1094CONFIG_NETPOLL_TRAP=y
1056CONFIG_NET_POLL_CONTROLLER=y 1095CONFIG_NET_POLL_CONTROLLER=y
1096# CONFIG_VMXNET3 is not set
1057# CONFIG_ISDN is not set 1097# CONFIG_ISDN is not set
1058# CONFIG_PHONE is not set 1098# CONFIG_PHONE is not set
1059 1099
@@ -1063,6 +1103,7 @@ CONFIG_NET_POLL_CONTROLLER=y
1063CONFIG_INPUT=y 1103CONFIG_INPUT=y
1064# CONFIG_INPUT_FF_MEMLESS is not set 1104# CONFIG_INPUT_FF_MEMLESS is not set
1065# CONFIG_INPUT_POLLDEV is not set 1105# CONFIG_INPUT_POLLDEV is not set
1106# CONFIG_INPUT_SPARSEKMAP is not set
1066 1107
1067# 1108#
1068# Userland interfaces 1109# Userland interfaces
@@ -1121,8 +1162,6 @@ CONFIG_SERIAL_NONSTANDARD=y
1121# CONFIG_N_HDLC is not set 1162# CONFIG_N_HDLC is not set
1122# CONFIG_RISCOM8 is not set 1163# CONFIG_RISCOM8 is not set
1123# CONFIG_SPECIALIX is not set 1164# CONFIG_SPECIALIX is not set
1124# CONFIG_SX is not set
1125# CONFIG_RIO is not set
1126# CONFIG_STALDRV is not set 1165# CONFIG_STALDRV is not set
1127# CONFIG_NOZOMI is not set 1166# CONFIG_NOZOMI is not set
1128 1167
@@ -1140,6 +1179,7 @@ CONFIG_SERIAL_MPSC_CONSOLE=y
1140CONFIG_SERIAL_CORE=y 1179CONFIG_SERIAL_CORE=y
1141CONFIG_SERIAL_CORE_CONSOLE=y 1180CONFIG_SERIAL_CORE_CONSOLE=y
1142# CONFIG_SERIAL_JSM is not set 1181# CONFIG_SERIAL_JSM is not set
1182# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
1143CONFIG_UNIX98_PTYS=y 1183CONFIG_UNIX98_PTYS=y
1144# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1184# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1145# CONFIG_LEGACY_PTYS is not set 1185# CONFIG_LEGACY_PTYS is not set
@@ -1200,11 +1240,6 @@ CONFIG_I2C_MV64XXX=m
1200# CONFIG_I2C_TINY_USB is not set 1240# CONFIG_I2C_TINY_USB is not set
1201 1241
1202# 1242#
1203# Graphics adapter I2C/DDC channel drivers
1204#
1205# CONFIG_I2C_VOODOO3 is not set
1206
1207#
1208# Other I2C/SMBus bus drivers 1243# Other I2C/SMBus bus drivers
1209# 1244#
1210# CONFIG_I2C_PCA_PLATFORM is not set 1245# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1213,7 +1248,6 @@ CONFIG_I2C_MV64XXX=m
1213# 1248#
1214# Miscellaneous I2C Chip support 1249# Miscellaneous I2C Chip support
1215# 1250#
1216# CONFIG_DS1682 is not set
1217# CONFIG_SENSORS_TSL2550 is not set 1251# CONFIG_SENSORS_TSL2550 is not set
1218# CONFIG_I2C_DEBUG_CORE is not set 1252# CONFIG_I2C_DEBUG_CORE is not set
1219# CONFIG_I2C_DEBUG_ALGO is not set 1253# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1259,6 +1293,7 @@ CONFIG_SENSORS_GL518SM=m
1259# CONFIG_SENSORS_GL520SM is not set 1293# CONFIG_SENSORS_GL520SM is not set
1260CONFIG_SENSORS_IT87=m 1294CONFIG_SENSORS_IT87=m
1261# CONFIG_SENSORS_LM63 is not set 1295# CONFIG_SENSORS_LM63 is not set
1296# CONFIG_SENSORS_LM73 is not set
1262CONFIG_SENSORS_LM75=m 1297CONFIG_SENSORS_LM75=m
1263CONFIG_SENSORS_LM77=m 1298CONFIG_SENSORS_LM77=m
1264CONFIG_SENSORS_LM78=m 1299CONFIG_SENSORS_LM78=m
@@ -1297,6 +1332,7 @@ CONFIG_SENSORS_W83L785TS=m
1297# CONFIG_SENSORS_W83L786NG is not set 1332# CONFIG_SENSORS_W83L786NG is not set
1298CONFIG_SENSORS_W83627HF=m 1333CONFIG_SENSORS_W83627HF=m
1299# CONFIG_SENSORS_W83627EHF is not set 1334# CONFIG_SENSORS_W83627EHF is not set
1335# CONFIG_SENSORS_LIS3_I2C is not set
1300# CONFIG_THERMAL is not set 1336# CONFIG_THERMAL is not set
1301CONFIG_WATCHDOG=y 1337CONFIG_WATCHDOG=y
1302# CONFIG_WATCHDOG_NOWAYOUT is not set 1338# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1333,7 +1369,6 @@ CONFIG_SSB_POSSIBLE=y
1333# CONFIG_HTC_PASIC3 is not set 1369# CONFIG_HTC_PASIC3 is not set
1334# CONFIG_MFD_TMIO is not set 1370# CONFIG_MFD_TMIO is not set
1335# CONFIG_MFD_WM8400 is not set 1371# CONFIG_MFD_WM8400 is not set
1336# CONFIG_MFD_WM831X is not set
1337# CONFIG_MFD_WM8350_I2C is not set 1372# CONFIG_MFD_WM8350_I2C is not set
1338# CONFIG_MFD_PCF50633 is not set 1373# CONFIG_MFD_PCF50633 is not set
1339# CONFIG_AB3100_CORE is not set 1374# CONFIG_AB3100_CORE is not set
@@ -1392,6 +1427,7 @@ CONFIG_USB_MON=m
1392CONFIG_USB_EHCI_HCD=m 1427CONFIG_USB_EHCI_HCD=m
1393CONFIG_USB_EHCI_ROOT_HUB_TT=y 1428CONFIG_USB_EHCI_ROOT_HUB_TT=y
1394# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1429# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1430# CONFIG_XPS_USB_HCD_XILINX is not set
1395CONFIG_USB_EHCI_HCD_PPC_OF=y 1431CONFIG_USB_EHCI_HCD_PPC_OF=y
1396# CONFIG_USB_OXU210HP_HCD is not set 1432# CONFIG_USB_OXU210HP_HCD is not set
1397# CONFIG_USB_ISP116X_HCD is not set 1433# CONFIG_USB_ISP116X_HCD is not set
@@ -1923,7 +1959,6 @@ CONFIG_SECURITY=y
1923CONFIG_SECURITY_NETWORK=y 1959CONFIG_SECURITY_NETWORK=y
1924# CONFIG_SECURITY_NETWORK_XFRM is not set 1960# CONFIG_SECURITY_NETWORK_XFRM is not set
1925# CONFIG_SECURITY_PATH is not set 1961# CONFIG_SECURITY_PATH is not set
1926# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1927CONFIG_LSM_MMAP_MIN_ADDR=65536 1962CONFIG_LSM_MMAP_MIN_ADDR=65536
1928CONFIG_SECURITY_SELINUX=y 1963CONFIG_SECURITY_SELINUX=y
1929CONFIG_SECURITY_SELINUX_BOOTPARAM=y 1964CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -1934,6 +1969,11 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
1934CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 1969CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
1935# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set 1970# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
1936# CONFIG_SECURITY_TOMOYO is not set 1971# CONFIG_SECURITY_TOMOYO is not set
1972CONFIG_DEFAULT_SECURITY_SELINUX=y
1973# CONFIG_DEFAULT_SECURITY_SMACK is not set
1974# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1975# CONFIG_DEFAULT_SECURITY_DAC is not set
1976CONFIG_DEFAULT_SECURITY="selinux"
1937CONFIG_CRYPTO=y 1977CONFIG_CRYPTO=y
1938 1978
1939# 1979#
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index ef5edc7203f5..79105413884e 100644
--- a/arch/powerpc/configs/ep8248e_defconfig
+++ b/arch/powerpc/configs/ep8248e_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:06 2009 4# Wed Jan 6 09:23:59 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61# CONFIG_DEFAULT_UIMAGE is not set 62# CONFIG_DEFAULT_UIMAGE is not set
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -160,14 +163,41 @@ CONFIG_BLK_DEV_BSG=y
160# IO Schedulers 163# IO Schedulers
161# 164#
162CONFIG_IOSCHED_NOOP=y 165CONFIG_IOSCHED_NOOP=y
163# CONFIG_IOSCHED_AS is not set
164CONFIG_IOSCHED_DEADLINE=y 166CONFIG_IOSCHED_DEADLINE=y
165# CONFIG_IOSCHED_CFQ is not set 167# CONFIG_IOSCHED_CFQ is not set
166# CONFIG_DEFAULT_AS is not set
167CONFIG_DEFAULT_DEADLINE=y 168CONFIG_DEFAULT_DEADLINE=y
168# CONFIG_DEFAULT_CFQ is not set 169# CONFIG_DEFAULT_CFQ is not set
169# CONFIG_DEFAULT_NOOP is not set 170# CONFIG_DEFAULT_NOOP is not set
170CONFIG_DEFAULT_IOSCHED="deadline" 171CONFIG_DEFAULT_IOSCHED="deadline"
172# CONFIG_INLINE_SPIN_TRYLOCK is not set
173# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
174# CONFIG_INLINE_SPIN_LOCK is not set
175# CONFIG_INLINE_SPIN_LOCK_BH is not set
176# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
177# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
178CONFIG_INLINE_SPIN_UNLOCK=y
179# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
180CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
181# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
182# CONFIG_INLINE_READ_TRYLOCK is not set
183# CONFIG_INLINE_READ_LOCK is not set
184# CONFIG_INLINE_READ_LOCK_BH is not set
185# CONFIG_INLINE_READ_LOCK_IRQ is not set
186# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
187CONFIG_INLINE_READ_UNLOCK=y
188# CONFIG_INLINE_READ_UNLOCK_BH is not set
189CONFIG_INLINE_READ_UNLOCK_IRQ=y
190# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
191# CONFIG_INLINE_WRITE_TRYLOCK is not set
192# CONFIG_INLINE_WRITE_LOCK is not set
193# CONFIG_INLINE_WRITE_LOCK_BH is not set
194# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
195# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
196CONFIG_INLINE_WRITE_UNLOCK=y
197# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
198CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
199# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
200# CONFIG_MUTEX_SPIN_ON_OWNER is not set
171# CONFIG_FREEZER is not set 201# CONFIG_FREEZER is not set
172 202
173# 203#
@@ -237,6 +267,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
237CONFIG_ARCH_HAS_WALK_MEMORY=y 267CONFIG_ARCH_HAS_WALK_MEMORY=y
238CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 268CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
239# CONFIG_CRASH_DUMP is not set 269# CONFIG_CRASH_DUMP is not set
270CONFIG_SPARSE_IRQ=y
240CONFIG_MAX_ACTIVE_REGIONS=32 271CONFIG_MAX_ACTIVE_REGIONS=32
241CONFIG_ARCH_FLATMEM_ENABLE=y 272CONFIG_ARCH_FLATMEM_ENABLE=y
242CONFIG_ARCH_POPULATES_NODE_MAP=y 273CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -249,8 +280,6 @@ CONFIG_MIGRATION=y
249CONFIG_ZONE_DMA_FLAG=1 280CONFIG_ZONE_DMA_FLAG=1
250CONFIG_BOUNCE=y 281CONFIG_BOUNCE=y
251CONFIG_VIRT_TO_BUS=y 282CONFIG_VIRT_TO_BUS=y
252CONFIG_HAVE_MLOCK=y
253CONFIG_HAVE_MLOCKED_PAGE_BIT=y
254# CONFIG_KSM is not set 283# CONFIG_KSM is not set
255CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 284CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
256CONFIG_PPC_4K_PAGES=y 285CONFIG_PPC_4K_PAGES=y
@@ -400,9 +429,6 @@ CONFIG_NETFILTER_ADVANCED=y
400# CONFIG_BT is not set 429# CONFIG_BT is not set
401CONFIG_WIRELESS=y 430CONFIG_WIRELESS=y
402# CONFIG_CFG80211 is not set 431# CONFIG_CFG80211 is not set
403CONFIG_CFG80211_DEFAULT_PS_VALUE=0
404CONFIG_WIRELESS_OLD_REGULATORY=y
405# CONFIG_WIRELESS_EXT is not set
406# CONFIG_LIB80211 is not set 432# CONFIG_LIB80211 is not set
407 433
408# 434#
@@ -523,6 +549,10 @@ CONFIG_BLK_DEV=y
523# CONFIG_BLK_DEV_COW_COMMON is not set 549# CONFIG_BLK_DEV_COW_COMMON is not set
524CONFIG_BLK_DEV_LOOP=y 550CONFIG_BLK_DEV_LOOP=y
525# CONFIG_BLK_DEV_CRYPTOLOOP is not set 551# CONFIG_BLK_DEV_CRYPTOLOOP is not set
552
553#
554# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
555#
526# CONFIG_BLK_DEV_NBD is not set 556# CONFIG_BLK_DEV_NBD is not set
527# CONFIG_BLK_DEV_SX8 is not set 557# CONFIG_BLK_DEV_SX8 is not set
528# CONFIG_BLK_DEV_RAM is not set 558# CONFIG_BLK_DEV_RAM is not set
@@ -553,7 +583,7 @@ CONFIG_HAVE_IDE=y
553# 583#
554 584
555# 585#
556# See the help texts for more information. 586# The newer stack is recommended.
557# 587#
558# CONFIG_FIREWIRE is not set 588# CONFIG_FIREWIRE is not set
559# CONFIG_IEEE1394 is not set 589# CONFIG_IEEE1394 is not set
@@ -658,8 +688,9 @@ CONFIG_CHELSIO_T3_DEPENDS=y
658# CONFIG_BE2NET is not set 688# CONFIG_BE2NET is not set
659# CONFIG_TR is not set 689# CONFIG_TR is not set
660CONFIG_WLAN=y 690CONFIG_WLAN=y
661# CONFIG_WLAN_PRE80211 is not set 691# CONFIG_AIRO is not set
662# CONFIG_WLAN_80211 is not set 692# CONFIG_ATMEL is not set
693# CONFIG_HOSTAP is not set
663 694
664# 695#
665# Enable WiMAX (Networking options) to see the WiMAX drivers 696# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -670,6 +701,7 @@ CONFIG_WLAN=y
670# CONFIG_SLIP is not set 701# CONFIG_SLIP is not set
671# CONFIG_NETPOLL is not set 702# CONFIG_NETPOLL is not set
672# CONFIG_NET_POLL_CONTROLLER is not set 703# CONFIG_NET_POLL_CONTROLLER is not set
704# CONFIG_VMXNET3 is not set
673# CONFIG_ISDN is not set 705# CONFIG_ISDN is not set
674# CONFIG_PHONE is not set 706# CONFIG_PHONE is not set
675 707
@@ -705,6 +737,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
705CONFIG_SERIAL_CPM=y 737CONFIG_SERIAL_CPM=y
706CONFIG_SERIAL_CPM_CONSOLE=y 738CONFIG_SERIAL_CPM_CONSOLE=y
707# CONFIG_SERIAL_JSM is not set 739# CONFIG_SERIAL_JSM is not set
740# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
708CONFIG_UNIX98_PTYS=y 741CONFIG_UNIX98_PTYS=y
709# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 742# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
710CONFIG_LEGACY_PTYS=y 743CONFIG_LEGACY_PTYS=y
@@ -741,6 +774,7 @@ CONFIG_GPIOLIB=y
741# 774#
742# PCI GPIO expanders: 775# PCI GPIO expanders:
743# 776#
777# CONFIG_GPIO_CS5535 is not set
744# CONFIG_GPIO_BT8XX is not set 778# CONFIG_GPIO_BT8XX is not set
745# CONFIG_GPIO_LANGWELL is not set 779# CONFIG_GPIO_LANGWELL is not set
746 780
@@ -1061,7 +1095,11 @@ CONFIG_BDI_SWITCH=y
1061# CONFIG_KEYS is not set 1095# CONFIG_KEYS is not set
1062# CONFIG_SECURITY is not set 1096# CONFIG_SECURITY is not set
1063# CONFIG_SECURITYFS is not set 1097# CONFIG_SECURITYFS is not set
1064# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1098# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1099# CONFIG_DEFAULT_SECURITY_SMACK is not set
1100# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1101CONFIG_DEFAULT_SECURITY_DAC=y
1102CONFIG_DEFAULT_SECURITY=""
1065CONFIG_CRYPTO=y 1103CONFIG_CRYPTO=y
1066 1104
1067# 1105#
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index 73ef9be41280..58f7ca71a59d 100644
--- a/arch/powerpc/configs/ep88xc_defconfig
+++ b/arch/powerpc/configs/ep88xc_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:07 2009 4# Wed Jan 6 09:24:00 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -54,6 +55,7 @@ CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 55CONFIG_GENERIC_BUG=y
55CONFIG_DTC=y 56CONFIG_DTC=y
56# CONFIG_DEFAULT_UIMAGE is not set 57# CONFIG_DEFAULT_UIMAGE is not set
58CONFIG_ARCH_HIBERNATION_POSSIBLE=y
57# CONFIG_PPC_DCR_NATIVE is not set 59# CONFIG_PPC_DCR_NATIVE is not set
58# CONFIG_PPC_DCR_MMIO is not set 60# CONFIG_PPC_DCR_MMIO is not set
59CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 61CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -81,6 +83,7 @@ CONFIG_SYSVIPC_SYSCTL=y
81# 83#
82CONFIG_TREE_RCU=y 84CONFIG_TREE_RCU=y
83# CONFIG_TREE_PREEMPT_RCU is not set 85# CONFIG_TREE_PREEMPT_RCU is not set
86# CONFIG_TINY_RCU is not set
84# CONFIG_RCU_TRACE is not set 87# CONFIG_RCU_TRACE is not set
85CONFIG_RCU_FANOUT=32 88CONFIG_RCU_FANOUT=32
86# CONFIG_RCU_FANOUT_EXACT is not set 89# CONFIG_RCU_FANOUT_EXACT is not set
@@ -159,14 +162,41 @@ CONFIG_LBDAF=y
159# IO Schedulers 162# IO Schedulers
160# 163#
161CONFIG_IOSCHED_NOOP=y 164CONFIG_IOSCHED_NOOP=y
162# CONFIG_IOSCHED_AS is not set
163CONFIG_IOSCHED_DEADLINE=y 165CONFIG_IOSCHED_DEADLINE=y
164# CONFIG_IOSCHED_CFQ is not set 166# CONFIG_IOSCHED_CFQ is not set
165# CONFIG_DEFAULT_AS is not set
166CONFIG_DEFAULT_DEADLINE=y 167CONFIG_DEFAULT_DEADLINE=y
167# CONFIG_DEFAULT_CFQ is not set 168# CONFIG_DEFAULT_CFQ is not set
168# CONFIG_DEFAULT_NOOP is not set 169# CONFIG_DEFAULT_NOOP is not set
169CONFIG_DEFAULT_IOSCHED="deadline" 170CONFIG_DEFAULT_IOSCHED="deadline"
171# CONFIG_INLINE_SPIN_TRYLOCK is not set
172# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
173# CONFIG_INLINE_SPIN_LOCK is not set
174# CONFIG_INLINE_SPIN_LOCK_BH is not set
175# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
176# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
177CONFIG_INLINE_SPIN_UNLOCK=y
178# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
179CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
180# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
181# CONFIG_INLINE_READ_TRYLOCK is not set
182# CONFIG_INLINE_READ_LOCK is not set
183# CONFIG_INLINE_READ_LOCK_BH is not set
184# CONFIG_INLINE_READ_LOCK_IRQ is not set
185# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
186CONFIG_INLINE_READ_UNLOCK=y
187# CONFIG_INLINE_READ_UNLOCK_BH is not set
188CONFIG_INLINE_READ_UNLOCK_IRQ=y
189# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
190# CONFIG_INLINE_WRITE_TRYLOCK is not set
191# CONFIG_INLINE_WRITE_LOCK is not set
192# CONFIG_INLINE_WRITE_LOCK_BH is not set
193# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
194# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
195CONFIG_INLINE_WRITE_UNLOCK=y
196# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
197CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
198# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
199# CONFIG_MUTEX_SPIN_ON_OWNER is not set
170# CONFIG_FREEZER is not set 200# CONFIG_FREEZER is not set
171 201
172# 202#
@@ -241,6 +271,7 @@ CONFIG_8XX_MINIMAL_FPEMU=y
241CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 271CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
242CONFIG_ARCH_HAS_WALK_MEMORY=y 272CONFIG_ARCH_HAS_WALK_MEMORY=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 273CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
274CONFIG_SPARSE_IRQ=y
244CONFIG_MAX_ACTIVE_REGIONS=32 275CONFIG_MAX_ACTIVE_REGIONS=32
245CONFIG_ARCH_FLATMEM_ENABLE=y 276CONFIG_ARCH_FLATMEM_ENABLE=y
246CONFIG_ARCH_POPULATES_NODE_MAP=y 277CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -257,8 +288,6 @@ CONFIG_MIGRATION=y
257CONFIG_ZONE_DMA_FLAG=1 288CONFIG_ZONE_DMA_FLAG=1
258CONFIG_BOUNCE=y 289CONFIG_BOUNCE=y
259CONFIG_VIRT_TO_BUS=y 290CONFIG_VIRT_TO_BUS=y
260CONFIG_HAVE_MLOCK=y
261CONFIG_HAVE_MLOCKED_PAGE_BIT=y
262# CONFIG_KSM is not set 291# CONFIG_KSM is not set
263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 292CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264CONFIG_PPC_4K_PAGES=y 293CONFIG_PPC_4K_PAGES=y
@@ -372,9 +401,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
372# CONFIG_AF_RXRPC is not set 401# CONFIG_AF_RXRPC is not set
373CONFIG_WIRELESS=y 402CONFIG_WIRELESS=y
374# CONFIG_CFG80211 is not set 403# CONFIG_CFG80211 is not set
375CONFIG_CFG80211_DEFAULT_PS_VALUE=0
376CONFIG_WIRELESS_OLD_REGULATORY=y
377# CONFIG_WIRELESS_EXT is not set
378# CONFIG_LIB80211 is not set 404# CONFIG_LIB80211 is not set
379 405
380# 406#
@@ -545,8 +571,7 @@ CONFIG_FS_ENET_MDIO_FEC=y
545# CONFIG_NETDEV_1000 is not set 571# CONFIG_NETDEV_1000 is not set
546# CONFIG_NETDEV_10000 is not set 572# CONFIG_NETDEV_10000 is not set
547CONFIG_WLAN=y 573CONFIG_WLAN=y
548# CONFIG_WLAN_PRE80211 is not set 574# CONFIG_HOSTAP is not set
549# CONFIG_WLAN_80211 is not set
550 575
551# 576#
552# Enable WiMAX (Networking options) to see the WiMAX drivers 577# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -591,6 +616,7 @@ CONFIG_SERIAL_CORE=y
591CONFIG_SERIAL_CORE_CONSOLE=y 616CONFIG_SERIAL_CORE_CONSOLE=y
592CONFIG_SERIAL_CPM=y 617CONFIG_SERIAL_CPM=y
593CONFIG_SERIAL_CPM_CONSOLE=y 618CONFIG_SERIAL_CPM_CONSOLE=y
619# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
594CONFIG_UNIX98_PTYS=y 620CONFIG_UNIX98_PTYS=y
595# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 621# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
596# CONFIG_LEGACY_PTYS is not set 622# CONFIG_LEGACY_PTYS is not set
@@ -851,6 +877,7 @@ CONFIG_DEBUG_INFO=y
851# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 877# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
852# CONFIG_FAULT_INJECTION is not set 878# CONFIG_FAULT_INJECTION is not set
853# CONFIG_LATENCYTOP is not set 879# CONFIG_LATENCYTOP is not set
880# CONFIG_SYSCTL_SYSCALL_CHECK is not set
854# CONFIG_DEBUG_PAGEALLOC is not set 881# CONFIG_DEBUG_PAGEALLOC is not set
855CONFIG_HAVE_FUNCTION_TRACER=y 882CONFIG_HAVE_FUNCTION_TRACER=y
856CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 883CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -893,7 +920,11 @@ CONFIG_PRINT_STACK_DEPTH=64
893# CONFIG_KEYS is not set 920# CONFIG_KEYS is not set
894# CONFIG_SECURITY is not set 921# CONFIG_SECURITY is not set
895# CONFIG_SECURITYFS is not set 922# CONFIG_SECURITYFS is not set
896# CONFIG_SECURITY_FILE_CAPABILITIES is not set 923# CONFIG_DEFAULT_SECURITY_SELINUX is not set
924# CONFIG_DEFAULT_SECURITY_SMACK is not set
925# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
926CONFIG_DEFAULT_SECURITY_DAC=y
927CONFIG_DEFAULT_SECURITY=""
897# CONFIG_CRYPTO is not set 928# CONFIG_CRYPTO is not set
898CONFIG_PPC_CLOCK=y 929CONFIG_PPC_CLOCK=y
899CONFIG_PPC_LIB_RHEAP=y 930CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 63c3e8de8f16..9a0c981277eb 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:08 2009 4# Wed Jan 6 09:24:01 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -86,6 +88,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
86# 88#
87CONFIG_TREE_RCU=y 89CONFIG_TREE_RCU=y
88# CONFIG_TREE_PREEMPT_RCU is not set 90# CONFIG_TREE_PREEMPT_RCU is not set
91# CONFIG_TINY_RCU is not set
89# CONFIG_RCU_TRACE is not set 92# CONFIG_RCU_TRACE is not set
90CONFIG_RCU_FANOUT=32 93CONFIG_RCU_FANOUT=32
91# CONFIG_RCU_FANOUT_EXACT is not set 94# CONFIG_RCU_FANOUT_EXACT is not set
@@ -181,14 +184,41 @@ CONFIG_LBDAF=y
181# IO Schedulers 184# IO Schedulers
182# 185#
183CONFIG_IOSCHED_NOOP=y 186CONFIG_IOSCHED_NOOP=y
184CONFIG_IOSCHED_AS=y
185CONFIG_IOSCHED_DEADLINE=y 187CONFIG_IOSCHED_DEADLINE=y
186CONFIG_IOSCHED_CFQ=y 188CONFIG_IOSCHED_CFQ=y
187CONFIG_DEFAULT_AS=y
188# CONFIG_DEFAULT_DEADLINE is not set 189# CONFIG_DEFAULT_DEADLINE is not set
189# CONFIG_DEFAULT_CFQ is not set 190CONFIG_DEFAULT_CFQ=y
190# CONFIG_DEFAULT_NOOP is not set 191# CONFIG_DEFAULT_NOOP is not set
191CONFIG_DEFAULT_IOSCHED="anticipatory" 192CONFIG_DEFAULT_IOSCHED="cfq"
193# CONFIG_INLINE_SPIN_TRYLOCK is not set
194# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
195# CONFIG_INLINE_SPIN_LOCK is not set
196# CONFIG_INLINE_SPIN_LOCK_BH is not set
197# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
198# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
199CONFIG_INLINE_SPIN_UNLOCK=y
200# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
201CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
202# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
203# CONFIG_INLINE_READ_TRYLOCK is not set
204# CONFIG_INLINE_READ_LOCK is not set
205# CONFIG_INLINE_READ_LOCK_BH is not set
206# CONFIG_INLINE_READ_LOCK_IRQ is not set
207# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
208CONFIG_INLINE_READ_UNLOCK=y
209# CONFIG_INLINE_READ_UNLOCK_BH is not set
210CONFIG_INLINE_READ_UNLOCK_IRQ=y
211# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
212# CONFIG_INLINE_WRITE_TRYLOCK is not set
213# CONFIG_INLINE_WRITE_LOCK is not set
214# CONFIG_INLINE_WRITE_LOCK_BH is not set
215# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
216# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
217CONFIG_INLINE_WRITE_UNLOCK=y
218# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
219CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
220# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
221# CONFIG_MUTEX_SPIN_ON_OWNER is not set
192# CONFIG_FREEZER is not set 222# CONFIG_FREEZER is not set
193 223
194# 224#
@@ -215,6 +245,8 @@ CONFIG_LINKSTATION=y
215CONFIG_MPC10X_BRIDGE=y 245CONFIG_MPC10X_BRIDGE=y
216CONFIG_MPC10X_OPENPIC=y 246CONFIG_MPC10X_OPENPIC=y
217# CONFIG_MPC10X_STORE_GATHERING is not set 247# CONFIG_MPC10X_STORE_GATHERING is not set
248# CONFIG_GAMECUBE is not set
249# CONFIG_WII is not set
218# CONFIG_AMIGAONE is not set 250# CONFIG_AMIGAONE is not set
219CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 251CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
220# CONFIG_IPIC is not set 252# CONFIG_IPIC is not set
@@ -261,6 +293,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
261CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 293CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
262# CONFIG_KEXEC is not set 294# CONFIG_KEXEC is not set
263# CONFIG_CRASH_DUMP is not set 295# CONFIG_CRASH_DUMP is not set
296CONFIG_SPARSE_IRQ=y
264CONFIG_MAX_ACTIVE_REGIONS=32 297CONFIG_MAX_ACTIVE_REGIONS=32
265CONFIG_ARCH_FLATMEM_ENABLE=y 298CONFIG_ARCH_FLATMEM_ENABLE=y
266CONFIG_ARCH_POPULATES_NODE_MAP=y 299CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -277,8 +310,6 @@ CONFIG_MIGRATION=y
277CONFIG_ZONE_DMA_FLAG=1 310CONFIG_ZONE_DMA_FLAG=1
278CONFIG_BOUNCE=y 311CONFIG_BOUNCE=y
279CONFIG_VIRT_TO_BUS=y 312CONFIG_VIRT_TO_BUS=y
280CONFIG_HAVE_MLOCK=y
281CONFIG_HAVE_MLOCKED_PAGE_BIT=y
282# CONFIG_KSM is not set 313# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 314CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284CONFIG_PPC_4K_PAGES=y 315CONFIG_PPC_4K_PAGES=y
@@ -517,10 +548,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
517# CONFIG_AF_RXRPC is not set 548# CONFIG_AF_RXRPC is not set
518CONFIG_WIRELESS=y 549CONFIG_WIRELESS=y
519# CONFIG_CFG80211 is not set 550# CONFIG_CFG80211 is not set
520CONFIG_CFG80211_DEFAULT_PS_VALUE=0
521CONFIG_WIRELESS_OLD_REGULATORY=y
522CONFIG_WIRELESS_EXT=y
523CONFIG_WIRELESS_EXT_SYSFS=y
524# CONFIG_LIB80211 is not set 551# CONFIG_LIB80211 is not set
525 552
526# 553#
@@ -650,6 +677,10 @@ CONFIG_BLK_DEV=y
650# CONFIG_BLK_DEV_COW_COMMON is not set 677# CONFIG_BLK_DEV_COW_COMMON is not set
651CONFIG_BLK_DEV_LOOP=y 678CONFIG_BLK_DEV_LOOP=y
652# CONFIG_BLK_DEV_CRYPTOLOOP is not set 679# CONFIG_BLK_DEV_CRYPTOLOOP is not set
680
681#
682# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
683#
653# CONFIG_BLK_DEV_NBD is not set 684# CONFIG_BLK_DEV_NBD is not set
654# CONFIG_BLK_DEV_SX8 is not set 685# CONFIG_BLK_DEV_SX8 is not set
655# CONFIG_BLK_DEV_UB is not set 686# CONFIG_BLK_DEV_UB is not set
@@ -661,6 +692,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
661# CONFIG_ATA_OVER_ETH is not set 692# CONFIG_ATA_OVER_ETH is not set
662# CONFIG_BLK_DEV_HD is not set 693# CONFIG_BLK_DEV_HD is not set
663CONFIG_MISC_DEVICES=y 694CONFIG_MISC_DEVICES=y
695# CONFIG_AD525X_DPOT is not set
664# CONFIG_PHANTOM is not set 696# CONFIG_PHANTOM is not set
665# CONFIG_SGI_IOC4 is not set 697# CONFIG_SGI_IOC4 is not set
666# CONFIG_TIFM_CORE is not set 698# CONFIG_TIFM_CORE is not set
@@ -668,6 +700,7 @@ CONFIG_MISC_DEVICES=y
668# CONFIG_ENCLOSURE_SERVICES is not set 700# CONFIG_ENCLOSURE_SERVICES is not set
669# CONFIG_HP_ILO is not set 701# CONFIG_HP_ILO is not set
670# CONFIG_ISL29003 is not set 702# CONFIG_ISL29003 is not set
703# CONFIG_DS1682 is not set
671# CONFIG_C2PORT is not set 704# CONFIG_C2PORT is not set
672 705
673# 706#
@@ -720,7 +753,9 @@ CONFIG_SCSI_LOWLEVEL=y
720# CONFIG_SCSI_BNX2_ISCSI is not set 753# CONFIG_SCSI_BNX2_ISCSI is not set
721# CONFIG_BE2ISCSI is not set 754# CONFIG_BE2ISCSI is not set
722# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 755# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
756# CONFIG_SCSI_HPSA is not set
723# CONFIG_SCSI_3W_9XXX is not set 757# CONFIG_SCSI_3W_9XXX is not set
758# CONFIG_SCSI_3W_SAS is not set
724# CONFIG_SCSI_ACARD is not set 759# CONFIG_SCSI_ACARD is not set
725# CONFIG_SCSI_AACRAID is not set 760# CONFIG_SCSI_AACRAID is not set
726# CONFIG_SCSI_AIC7XXX is not set 761# CONFIG_SCSI_AIC7XXX is not set
@@ -759,6 +794,7 @@ CONFIG_SCSI_LOWLEVEL=y
759# CONFIG_SCSI_NSP32 is not set 794# CONFIG_SCSI_NSP32 is not set
760# CONFIG_SCSI_DEBUG is not set 795# CONFIG_SCSI_DEBUG is not set
761# CONFIG_SCSI_PMCRAID is not set 796# CONFIG_SCSI_PMCRAID is not set
797# CONFIG_SCSI_PM8001 is not set
762# CONFIG_SCSI_SRP is not set 798# CONFIG_SCSI_SRP is not set
763# CONFIG_SCSI_BFA_FC is not set 799# CONFIG_SCSI_BFA_FC is not set
764# CONFIG_SCSI_DH is not set 800# CONFIG_SCSI_DH is not set
@@ -814,15 +850,16 @@ CONFIG_PATA_IT821X=y
814# CONFIG_PATA_NS87415 is not set 850# CONFIG_PATA_NS87415 is not set
815# CONFIG_PATA_OPTI is not set 851# CONFIG_PATA_OPTI is not set
816# CONFIG_PATA_OPTIDMA is not set 852# CONFIG_PATA_OPTIDMA is not set
853# CONFIG_PATA_PDC2027X is not set
817# CONFIG_PATA_PDC_OLD is not set 854# CONFIG_PATA_PDC_OLD is not set
818# CONFIG_PATA_RADISYS is not set 855# CONFIG_PATA_RADISYS is not set
819# CONFIG_PATA_RDC is not set 856# CONFIG_PATA_RDC is not set
820# CONFIG_PATA_RZ1000 is not set 857# CONFIG_PATA_RZ1000 is not set
821# CONFIG_PATA_SC1200 is not set 858# CONFIG_PATA_SC1200 is not set
822# CONFIG_PATA_SERVERWORKS is not set 859# CONFIG_PATA_SERVERWORKS is not set
823# CONFIG_PATA_PDC2027X is not set
824CONFIG_PATA_SIL680=y 860CONFIG_PATA_SIL680=y
825# CONFIG_PATA_SIS is not set 861# CONFIG_PATA_SIS is not set
862# CONFIG_PATA_TOSHIBA is not set
826# CONFIG_PATA_VIA is not set 863# CONFIG_PATA_VIA is not set
827# CONFIG_PATA_WINBOND is not set 864# CONFIG_PATA_WINBOND is not set
828# CONFIG_PATA_PLATFORM is not set 865# CONFIG_PATA_PLATFORM is not set
@@ -839,7 +876,7 @@ CONFIG_PATA_SIL680=y
839# 876#
840 877
841# 878#
842# See the help texts for more information. 879# The newer stack is recommended.
843# 880#
844# CONFIG_FIREWIRE is not set 881# CONFIG_FIREWIRE is not set
845# CONFIG_IEEE1394 is not set 882# CONFIG_IEEE1394 is not set
@@ -934,8 +971,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
934# CONFIG_BE2NET is not set 971# CONFIG_BE2NET is not set
935# CONFIG_TR is not set 972# CONFIG_TR is not set
936CONFIG_WLAN=y 973CONFIG_WLAN=y
937# CONFIG_WLAN_PRE80211 is not set 974# CONFIG_AIRO is not set
938# CONFIG_WLAN_80211 is not set 975# CONFIG_ATMEL is not set
976# CONFIG_PRISM54 is not set
977# CONFIG_USB_ZD1201 is not set
978# CONFIG_HOSTAP is not set
939 979
940# 980#
941# Enable WiMAX (Networking options) to see the WiMAX drivers 981# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -960,6 +1000,7 @@ CONFIG_NETCONSOLE=y
960CONFIG_NETPOLL=y 1000CONFIG_NETPOLL=y
961# CONFIG_NETPOLL_TRAP is not set 1001# CONFIG_NETPOLL_TRAP is not set
962CONFIG_NET_POLL_CONTROLLER=y 1002CONFIG_NET_POLL_CONTROLLER=y
1003# CONFIG_VMXNET3 is not set
963# CONFIG_ISDN is not set 1004# CONFIG_ISDN is not set
964# CONFIG_PHONE is not set 1005# CONFIG_PHONE is not set
965 1006
@@ -969,6 +1010,7 @@ CONFIG_NET_POLL_CONTROLLER=y
969CONFIG_INPUT=y 1010CONFIG_INPUT=y
970# CONFIG_INPUT_FF_MEMLESS is not set 1011# CONFIG_INPUT_FF_MEMLESS is not set
971# CONFIG_INPUT_POLLDEV is not set 1012# CONFIG_INPUT_POLLDEV is not set
1013# CONFIG_INPUT_SPARSEKMAP is not set
972 1014
973# 1015#
974# Userland interfaces 1016# Userland interfaces
@@ -1007,6 +1049,7 @@ CONFIG_SERIO_SERPORT=y
1007# CONFIG_SERIO_PCIPS2 is not set 1049# CONFIG_SERIO_PCIPS2 is not set
1008# CONFIG_SERIO_RAW is not set 1050# CONFIG_SERIO_RAW is not set
1009# CONFIG_SERIO_XILINX_XPS_PS2 is not set 1051# CONFIG_SERIO_XILINX_XPS_PS2 is not set
1052# CONFIG_SERIO_ALTERA_PS2 is not set
1010# CONFIG_GAMEPORT is not set 1053# CONFIG_GAMEPORT is not set
1011 1054
1012# 1055#
@@ -1039,6 +1082,7 @@ CONFIG_SERIAL_CORE=y
1039CONFIG_SERIAL_CORE_CONSOLE=y 1082CONFIG_SERIAL_CORE_CONSOLE=y
1040# CONFIG_SERIAL_JSM is not set 1083# CONFIG_SERIAL_JSM is not set
1041# CONFIG_SERIAL_OF_PLATFORM is not set 1084# CONFIG_SERIAL_OF_PLATFORM is not set
1085# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
1042CONFIG_UNIX98_PTYS=y 1086CONFIG_UNIX98_PTYS=y
1043# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1087# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1044CONFIG_LEGACY_PTYS=y 1088CONFIG_LEGACY_PTYS=y
@@ -1096,11 +1140,6 @@ CONFIG_I2C_MPC=y
1096# CONFIG_I2C_TINY_USB is not set 1140# CONFIG_I2C_TINY_USB is not set
1097 1141
1098# 1142#
1099# Graphics adapter I2C/DDC channel drivers
1100#
1101# CONFIG_I2C_VOODOO3 is not set
1102
1103#
1104# Other I2C/SMBus bus drivers 1143# Other I2C/SMBus bus drivers
1105# 1144#
1106# CONFIG_I2C_PCA_PLATFORM is not set 1145# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1109,7 +1148,6 @@ CONFIG_I2C_MPC=y
1109# 1148#
1110# Miscellaneous I2C Chip support 1149# Miscellaneous I2C Chip support
1111# 1150#
1112# CONFIG_DS1682 is not set
1113# CONFIG_SENSORS_TSL2550 is not set 1151# CONFIG_SENSORS_TSL2550 is not set
1114# CONFIG_I2C_DEBUG_CORE is not set 1152# CONFIG_I2C_DEBUG_CORE is not set
1115# CONFIG_I2C_DEBUG_ALGO is not set 1153# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1155,6 +1193,7 @@ CONFIG_HWMON=y
1155# CONFIG_SENSORS_GL520SM is not set 1193# CONFIG_SENSORS_GL520SM is not set
1156# CONFIG_SENSORS_IT87 is not set 1194# CONFIG_SENSORS_IT87 is not set
1157# CONFIG_SENSORS_LM63 is not set 1195# CONFIG_SENSORS_LM63 is not set
1196# CONFIG_SENSORS_LM73 is not set
1158# CONFIG_SENSORS_LM75 is not set 1197# CONFIG_SENSORS_LM75 is not set
1159# CONFIG_SENSORS_LM77 is not set 1198# CONFIG_SENSORS_LM77 is not set
1160# CONFIG_SENSORS_LM78 is not set 1199# CONFIG_SENSORS_LM78 is not set
@@ -1193,6 +1232,7 @@ CONFIG_HWMON=y
1193# CONFIG_SENSORS_W83L786NG is not set 1232# CONFIG_SENSORS_W83L786NG is not set
1194# CONFIG_SENSORS_W83627HF is not set 1233# CONFIG_SENSORS_W83627HF is not set
1195# CONFIG_SENSORS_W83627EHF is not set 1234# CONFIG_SENSORS_W83627EHF is not set
1235# CONFIG_SENSORS_LIS3_I2C is not set
1196# CONFIG_THERMAL is not set 1236# CONFIG_THERMAL is not set
1197# CONFIG_WATCHDOG is not set 1237# CONFIG_WATCHDOG is not set
1198CONFIG_SSB_POSSIBLE=y 1238CONFIG_SSB_POSSIBLE=y
@@ -1211,11 +1251,13 @@ CONFIG_SSB_POSSIBLE=y
1211# CONFIG_TWL4030_CORE is not set 1251# CONFIG_TWL4030_CORE is not set
1212# CONFIG_MFD_TMIO is not set 1252# CONFIG_MFD_TMIO is not set
1213# CONFIG_PMIC_DA903X is not set 1253# CONFIG_PMIC_DA903X is not set
1254# CONFIG_PMIC_ADP5520 is not set
1214# CONFIG_MFD_WM8400 is not set 1255# CONFIG_MFD_WM8400 is not set
1215# CONFIG_MFD_WM831X is not set 1256# CONFIG_MFD_WM831X is not set
1216# CONFIG_MFD_WM8350_I2C is not set 1257# CONFIG_MFD_WM8350_I2C is not set
1217# CONFIG_MFD_PCF50633 is not set 1258# CONFIG_MFD_PCF50633 is not set
1218# CONFIG_AB3100_CORE is not set 1259# CONFIG_AB3100_CORE is not set
1260# CONFIG_MFD_88PM8607 is not set
1219# CONFIG_REGULATOR is not set 1261# CONFIG_REGULATOR is not set
1220# CONFIG_MEDIA_SUPPORT is not set 1262# CONFIG_MEDIA_SUPPORT is not set
1221 1263
@@ -1281,6 +1323,7 @@ CONFIG_USB_MON=y
1281CONFIG_USB_EHCI_HCD=y 1323CONFIG_USB_EHCI_HCD=y
1282# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1324# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1283# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1325# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1326# CONFIG_XPS_USB_HCD_XILINX is not set
1284# CONFIG_USB_EHCI_FSL is not set 1327# CONFIG_USB_EHCI_FSL is not set
1285CONFIG_USB_EHCI_HCD_PPC_OF=y 1328CONFIG_USB_EHCI_HCD_PPC_OF=y
1286# CONFIG_USB_OXU210HP_HCD is not set 1329# CONFIG_USB_OXU210HP_HCD is not set
@@ -1454,6 +1497,7 @@ CONFIG_RTC_DRV_RS5C372=y
1454# CONFIG_RTC_DRV_PCF8563 is not set 1497# CONFIG_RTC_DRV_PCF8563 is not set
1455# CONFIG_RTC_DRV_PCF8583 is not set 1498# CONFIG_RTC_DRV_PCF8583 is not set
1456# CONFIG_RTC_DRV_M41T80 is not set 1499# CONFIG_RTC_DRV_M41T80 is not set
1500# CONFIG_RTC_DRV_BQ32K is not set
1457# CONFIG_RTC_DRV_S35390A is not set 1501# CONFIG_RTC_DRV_S35390A is not set
1458# CONFIG_RTC_DRV_FM3130 is not set 1502# CONFIG_RTC_DRV_FM3130 is not set
1459# CONFIG_RTC_DRV_RX8581 is not set 1503# CONFIG_RTC_DRV_RX8581 is not set
@@ -1475,7 +1519,9 @@ CONFIG_RTC_DRV_RS5C372=y
1475# CONFIG_RTC_DRV_M48T86 is not set 1519# CONFIG_RTC_DRV_M48T86 is not set
1476# CONFIG_RTC_DRV_M48T35 is not set 1520# CONFIG_RTC_DRV_M48T35 is not set
1477# CONFIG_RTC_DRV_M48T59 is not set 1521# CONFIG_RTC_DRV_M48T59 is not set
1522# CONFIG_RTC_DRV_MSM6242 is not set
1478# CONFIG_RTC_DRV_BQ4802 is not set 1523# CONFIG_RTC_DRV_BQ4802 is not set
1524# CONFIG_RTC_DRV_RP5C01 is not set
1479# CONFIG_RTC_DRV_V3020 is not set 1525# CONFIG_RTC_DRV_V3020 is not set
1480 1526
1481# 1527#
@@ -1786,7 +1832,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1786# CONFIG_KEYS is not set 1832# CONFIG_KEYS is not set
1787# CONFIG_SECURITY is not set 1833# CONFIG_SECURITY is not set
1788# CONFIG_SECURITYFS is not set 1834# CONFIG_SECURITYFS is not set
1789# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1835# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1836# CONFIG_DEFAULT_SECURITY_SMACK is not set
1837# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1838CONFIG_DEFAULT_SECURITY_DAC=y
1839CONFIG_DEFAULT_SECURITY=""
1790CONFIG_CRYPTO=y 1840CONFIG_CRYPTO=y
1791 1841
1792# 1842#
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig
index 520b04a0def9..4c2c877f9363 100644
--- a/arch/powerpc/configs/mgcoge_defconfig
+++ b/arch/powerpc/configs/mgcoge_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:09 2009 4# Wed Jan 6 09:24:02 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,7 +60,6 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61# CONFIG_DEFAULT_UIMAGE is not set 62# CONFIG_DEFAULT_UIMAGE is not set
62CONFIG_HIBERNATE_32=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y 63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 87#
88CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -168,14 +169,41 @@ CONFIG_BLK_DEV_BSG=y
168# IO Schedulers 169# IO Schedulers
169# 170#
170CONFIG_IOSCHED_NOOP=y 171CONFIG_IOSCHED_NOOP=y
171# CONFIG_IOSCHED_AS is not set
172CONFIG_IOSCHED_DEADLINE=y 172CONFIG_IOSCHED_DEADLINE=y
173# CONFIG_IOSCHED_CFQ is not set 173# CONFIG_IOSCHED_CFQ is not set
174# CONFIG_DEFAULT_AS is not set
175CONFIG_DEFAULT_DEADLINE=y 174CONFIG_DEFAULT_DEADLINE=y
176# CONFIG_DEFAULT_CFQ is not set 175# CONFIG_DEFAULT_CFQ is not set
177# CONFIG_DEFAULT_NOOP is not set 176# CONFIG_DEFAULT_NOOP is not set
178CONFIG_DEFAULT_IOSCHED="deadline" 177CONFIG_DEFAULT_IOSCHED="deadline"
178# CONFIG_INLINE_SPIN_TRYLOCK is not set
179# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
180# CONFIG_INLINE_SPIN_LOCK is not set
181# CONFIG_INLINE_SPIN_LOCK_BH is not set
182# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
184CONFIG_INLINE_SPIN_UNLOCK=y
185# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
186CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
187# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
188# CONFIG_INLINE_READ_TRYLOCK is not set
189# CONFIG_INLINE_READ_LOCK is not set
190# CONFIG_INLINE_READ_LOCK_BH is not set
191# CONFIG_INLINE_READ_LOCK_IRQ is not set
192# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
193CONFIG_INLINE_READ_UNLOCK=y
194# CONFIG_INLINE_READ_UNLOCK_BH is not set
195CONFIG_INLINE_READ_UNLOCK_IRQ=y
196# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_WRITE_TRYLOCK is not set
198# CONFIG_INLINE_WRITE_LOCK is not set
199# CONFIG_INLINE_WRITE_LOCK_BH is not set
200# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
202CONFIG_INLINE_WRITE_UNLOCK=y
203# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
204CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
205# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
206# CONFIG_MUTEX_SPIN_ON_OWNER is not set
179# CONFIG_FREEZER is not set 207# CONFIG_FREEZER is not set
180 208
181# 209#
@@ -208,7 +236,8 @@ CONFIG_MPIC=y
208# CONFIG_MPIC_WEIRD is not set 236# CONFIG_MPIC_WEIRD is not set
209CONFIG_PPC_I8259=y 237CONFIG_PPC_I8259=y
210CONFIG_PPC_RTAS=y 238CONFIG_PPC_RTAS=y
211# CONFIG_RTAS_ERROR_LOGGING is not set 239CONFIG_RTAS_ERROR_LOGGING=y
240CONFIG_PPC_RTAS_DAEMON=y
212CONFIG_RTAS_PROC=y 241CONFIG_RTAS_PROC=y
213# CONFIG_MMIO_NVRAM is not set 242# CONFIG_MMIO_NVRAM is not set
214CONFIG_PPC_MPC106=y 243CONFIG_PPC_MPC106=y
@@ -250,6 +279,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
250CONFIG_ARCH_HAS_WALK_MEMORY=y 279CONFIG_ARCH_HAS_WALK_MEMORY=y
251CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
252# CONFIG_CRASH_DUMP is not set 281# CONFIG_CRASH_DUMP is not set
282CONFIG_SPARSE_IRQ=y
253CONFIG_MAX_ACTIVE_REGIONS=32 283CONFIG_MAX_ACTIVE_REGIONS=32
254CONFIG_ARCH_FLATMEM_ENABLE=y 284CONFIG_ARCH_FLATMEM_ENABLE=y
255CONFIG_ARCH_POPULATES_NODE_MAP=y 285CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -262,8 +292,6 @@ CONFIG_MIGRATION=y
262CONFIG_ZONE_DMA_FLAG=1 292CONFIG_ZONE_DMA_FLAG=1
263CONFIG_BOUNCE=y 293CONFIG_BOUNCE=y
264CONFIG_VIRT_TO_BUS=y 294CONFIG_VIRT_TO_BUS=y
265CONFIG_HAVE_MLOCK=y
266CONFIG_HAVE_MLOCKED_PAGE_BIT=y
267# CONFIG_KSM is not set 295# CONFIG_KSM is not set
268CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 296CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
269CONFIG_PPC_4K_PAGES=y 297CONFIG_PPC_4K_PAGES=y
@@ -395,9 +423,6 @@ CONFIG_NETFILTER_ADVANCED=y
395# CONFIG_BT is not set 423# CONFIG_BT is not set
396CONFIG_WIRELESS=y 424CONFIG_WIRELESS=y
397# CONFIG_CFG80211 is not set 425# CONFIG_CFG80211 is not set
398CONFIG_CFG80211_DEFAULT_PS_VALUE=0
399CONFIG_WIRELESS_OLD_REGULATORY=y
400# CONFIG_WIRELESS_EXT is not set
401# CONFIG_LIB80211 is not set 426# CONFIG_LIB80211 is not set
402 427
403# 428#
@@ -525,6 +550,10 @@ CONFIG_BLK_DEV=y
525# CONFIG_BLK_DEV_COW_COMMON is not set 550# CONFIG_BLK_DEV_COW_COMMON is not set
526CONFIG_BLK_DEV_LOOP=y 551CONFIG_BLK_DEV_LOOP=y
527# CONFIG_BLK_DEV_CRYPTOLOOP is not set 552# CONFIG_BLK_DEV_CRYPTOLOOP is not set
553
554#
555# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
556#
528# CONFIG_BLK_DEV_NBD is not set 557# CONFIG_BLK_DEV_NBD is not set
529# CONFIG_BLK_DEV_SX8 is not set 558# CONFIG_BLK_DEV_SX8 is not set
530CONFIG_BLK_DEV_RAM=y 559CONFIG_BLK_DEV_RAM=y
@@ -558,7 +587,7 @@ CONFIG_HAVE_IDE=y
558# 587#
559 588
560# 589#
561# See the help texts for more information. 590# The newer stack is recommended.
562# 591#
563# CONFIG_FIREWIRE is not set 592# CONFIG_FIREWIRE is not set
564# CONFIG_IEEE1394 is not set 593# CONFIG_IEEE1394 is not set
@@ -625,8 +654,9 @@ CONFIG_FS_ENET_MDIO_FCC=y
625# CONFIG_NETDEV_10000 is not set 654# CONFIG_NETDEV_10000 is not set
626# CONFIG_TR is not set 655# CONFIG_TR is not set
627CONFIG_WLAN=y 656CONFIG_WLAN=y
628# CONFIG_WLAN_PRE80211 is not set 657# CONFIG_AIRO is not set
629# CONFIG_WLAN_80211 is not set 658# CONFIG_ATMEL is not set
659# CONFIG_HOSTAP is not set
630 660
631# 661#
632# Enable WiMAX (Networking options) to see the WiMAX drivers 662# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -637,6 +667,7 @@ CONFIG_WLAN=y
637# CONFIG_SLIP is not set 667# CONFIG_SLIP is not set
638# CONFIG_NETPOLL is not set 668# CONFIG_NETPOLL is not set
639# CONFIG_NET_POLL_CONTROLLER is not set 669# CONFIG_NET_POLL_CONTROLLER is not set
670# CONFIG_VMXNET3 is not set
640# CONFIG_ISDN is not set 671# CONFIG_ISDN is not set
641# CONFIG_PHONE is not set 672# CONFIG_PHONE is not set
642 673
@@ -673,6 +704,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
673CONFIG_SERIAL_CPM=y 704CONFIG_SERIAL_CPM=y
674CONFIG_SERIAL_CPM_CONSOLE=y 705CONFIG_SERIAL_CPM_CONSOLE=y
675# CONFIG_SERIAL_JSM is not set 706# CONFIG_SERIAL_JSM is not set
707# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
676CONFIG_UNIX98_PTYS=y 708CONFIG_UNIX98_PTYS=y
677# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 709# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
678CONFIG_LEGACY_PTYS=y 710CONFIG_LEGACY_PTYS=y
@@ -734,11 +766,6 @@ CONFIG_I2C_CPM=y
734# CONFIG_I2C_PARPORT_LIGHT is not set 766# CONFIG_I2C_PARPORT_LIGHT is not set
735 767
736# 768#
737# Graphics adapter I2C/DDC channel drivers
738#
739# CONFIG_I2C_VOODOO3 is not set
740
741#
742# Other I2C/SMBus bus drivers 769# Other I2C/SMBus bus drivers
743# 770#
744# CONFIG_I2C_PCA_PLATFORM is not set 771# CONFIG_I2C_PCA_PLATFORM is not set
@@ -775,6 +802,7 @@ CONFIG_GPIOLIB=y
775# 802#
776# PCI GPIO expanders: 803# PCI GPIO expanders:
777# 804#
805# CONFIG_GPIO_CS5535 is not set
778# CONFIG_GPIO_BT8XX is not set 806# CONFIG_GPIO_BT8XX is not set
779# CONFIG_GPIO_LANGWELL is not set 807# CONFIG_GPIO_LANGWELL is not set
780 808
@@ -807,11 +835,13 @@ CONFIG_SSB_POSSIBLE=y
807# CONFIG_TWL4030_CORE is not set 835# CONFIG_TWL4030_CORE is not set
808# CONFIG_MFD_TMIO is not set 836# CONFIG_MFD_TMIO is not set
809# CONFIG_PMIC_DA903X is not set 837# CONFIG_PMIC_DA903X is not set
838# CONFIG_PMIC_ADP5520 is not set
810# CONFIG_MFD_WM8400 is not set 839# CONFIG_MFD_WM8400 is not set
811# CONFIG_MFD_WM831X is not set 840# CONFIG_MFD_WM831X is not set
812# CONFIG_MFD_WM8350_I2C is not set 841# CONFIG_MFD_WM8350_I2C is not set
813# CONFIG_MFD_PCF50633 is not set 842# CONFIG_MFD_PCF50633 is not set
814# CONFIG_AB3100_CORE is not set 843# CONFIG_AB3100_CORE is not set
844# CONFIG_MFD_88PM8607 is not set
815# CONFIG_REGULATOR is not set 845# CONFIG_REGULATOR is not set
816# CONFIG_MEDIA_SUPPORT is not set 846# CONFIG_MEDIA_SUPPORT is not set
817 847
@@ -1118,7 +1148,11 @@ CONFIG_BDI_SWITCH=y
1118# CONFIG_KEYS is not set 1148# CONFIG_KEYS is not set
1119# CONFIG_SECURITY is not set 1149# CONFIG_SECURITY is not set
1120# CONFIG_SECURITYFS is not set 1150# CONFIG_SECURITYFS is not set
1121# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1151# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1152# CONFIG_DEFAULT_SECURITY_SMACK is not set
1153# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1154CONFIG_DEFAULT_SECURITY_DAC=y
1155CONFIG_DEFAULT_SECURITY=""
1122CONFIG_CRYPTO=y 1156CONFIG_CRYPTO=y
1123 1157
1124# 1158#
diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig
index 43c3c4fcdce3..9e090f2c7e36 100644
--- a/arch/powerpc/configs/mgsuvd_defconfig
+++ b/arch/powerpc/configs/mgsuvd_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:10 2009 4# Wed Jan 6 09:24:03 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -53,6 +54,7 @@ CONFIG_OF=y
53CONFIG_AUDIT_ARCH=y 54CONFIG_AUDIT_ARCH=y
54CONFIG_DTC=y 55CONFIG_DTC=y
55# CONFIG_DEFAULT_UIMAGE is not set 56# CONFIG_DEFAULT_UIMAGE is not set
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
56# CONFIG_PPC_DCR_NATIVE is not set 58# CONFIG_PPC_DCR_NATIVE is not set
57# CONFIG_PPC_DCR_MMIO is not set 59# CONFIG_PPC_DCR_MMIO is not set
58CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 60CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -80,6 +82,7 @@ CONFIG_SYSVIPC_SYSCTL=y
80# 82#
81CONFIG_TREE_RCU=y 83CONFIG_TREE_RCU=y
82# CONFIG_TREE_PREEMPT_RCU is not set 84# CONFIG_TREE_PREEMPT_RCU is not set
85# CONFIG_TINY_RCU is not set
83# CONFIG_RCU_TRACE is not set 86# CONFIG_RCU_TRACE is not set
84CONFIG_RCU_FANOUT=32 87CONFIG_RCU_FANOUT=32
85# CONFIG_RCU_FANOUT_EXACT is not set 88# CONFIG_RCU_FANOUT_EXACT is not set
@@ -162,14 +165,41 @@ CONFIG_LBDAF=y
162# IO Schedulers 165# IO Schedulers
163# 166#
164CONFIG_IOSCHED_NOOP=y 167CONFIG_IOSCHED_NOOP=y
165CONFIG_IOSCHED_AS=y
166CONFIG_IOSCHED_DEADLINE=y 168CONFIG_IOSCHED_DEADLINE=y
167CONFIG_IOSCHED_CFQ=y 169CONFIG_IOSCHED_CFQ=y
168CONFIG_DEFAULT_AS=y
169# CONFIG_DEFAULT_DEADLINE is not set 170# CONFIG_DEFAULT_DEADLINE is not set
170# CONFIG_DEFAULT_CFQ is not set 171CONFIG_DEFAULT_CFQ=y
171# CONFIG_DEFAULT_NOOP is not set 172# CONFIG_DEFAULT_NOOP is not set
172CONFIG_DEFAULT_IOSCHED="anticipatory" 173CONFIG_DEFAULT_IOSCHED="cfq"
174# CONFIG_INLINE_SPIN_TRYLOCK is not set
175# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
176# CONFIG_INLINE_SPIN_LOCK is not set
177# CONFIG_INLINE_SPIN_LOCK_BH is not set
178# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
179# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
180CONFIG_INLINE_SPIN_UNLOCK=y
181# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
182CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
183# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
184# CONFIG_INLINE_READ_TRYLOCK is not set
185# CONFIG_INLINE_READ_LOCK is not set
186# CONFIG_INLINE_READ_LOCK_BH is not set
187# CONFIG_INLINE_READ_LOCK_IRQ is not set
188# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
189CONFIG_INLINE_READ_UNLOCK=y
190# CONFIG_INLINE_READ_UNLOCK_BH is not set
191CONFIG_INLINE_READ_UNLOCK_IRQ=y
192# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
193# CONFIG_INLINE_WRITE_TRYLOCK is not set
194# CONFIG_INLINE_WRITE_LOCK is not set
195# CONFIG_INLINE_WRITE_LOCK_BH is not set
196# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
197# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
198CONFIG_INLINE_WRITE_UNLOCK=y
199# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
200CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
201# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
202# CONFIG_MUTEX_SPIN_ON_OWNER is not set
173# CONFIG_FREEZER is not set 203# CONFIG_FREEZER is not set
174 204
175# 205#
@@ -244,6 +274,7 @@ CONFIG_MATH_EMULATION=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 274CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
245CONFIG_ARCH_HAS_WALK_MEMORY=y 275CONFIG_ARCH_HAS_WALK_MEMORY=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 276CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
277CONFIG_SPARSE_IRQ=y
247CONFIG_MAX_ACTIVE_REGIONS=32 278CONFIG_MAX_ACTIVE_REGIONS=32
248CONFIG_ARCH_FLATMEM_ENABLE=y 279CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_POPULATES_NODE_MAP=y 280CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -260,8 +291,6 @@ CONFIG_MIGRATION=y
260CONFIG_ZONE_DMA_FLAG=1 291CONFIG_ZONE_DMA_FLAG=1
261CONFIG_BOUNCE=y 292CONFIG_BOUNCE=y
262CONFIG_VIRT_TO_BUS=y 293CONFIG_VIRT_TO_BUS=y
263CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y
265# CONFIG_KSM is not set 294# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 295CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 296CONFIG_PPC_4K_PAGES=y
@@ -379,9 +408,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
379# CONFIG_AF_RXRPC is not set 408# CONFIG_AF_RXRPC is not set
380CONFIG_WIRELESS=y 409CONFIG_WIRELESS=y
381# CONFIG_CFG80211 is not set 410# CONFIG_CFG80211 is not set
382CONFIG_CFG80211_DEFAULT_PS_VALUE=0
383CONFIG_WIRELESS_OLD_REGULATORY=y
384# CONFIG_WIRELESS_EXT is not set
385# CONFIG_LIB80211 is not set 411# CONFIG_LIB80211 is not set
386 412
387# 413#
@@ -497,6 +523,10 @@ CONFIG_BLK_DEV=y
497# CONFIG_BLK_DEV_COW_COMMON is not set 523# CONFIG_BLK_DEV_COW_COMMON is not set
498CONFIG_BLK_DEV_LOOP=y 524CONFIG_BLK_DEV_LOOP=y
499# CONFIG_BLK_DEV_CRYPTOLOOP is not set 525# CONFIG_BLK_DEV_CRYPTOLOOP is not set
526
527#
528# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
529#
500# CONFIG_BLK_DEV_NBD is not set 530# CONFIG_BLK_DEV_NBD is not set
501CONFIG_BLK_DEV_RAM=y 531CONFIG_BLK_DEV_RAM=y
502CONFIG_BLK_DEV_RAM_COUNT=16 532CONFIG_BLK_DEV_RAM_COUNT=16
@@ -568,8 +598,7 @@ CONFIG_FS_ENET_HAS_SCC=y
568# CONFIG_NETDEV_1000 is not set 598# CONFIG_NETDEV_1000 is not set
569# CONFIG_NETDEV_10000 is not set 599# CONFIG_NETDEV_10000 is not set
570CONFIG_WLAN=y 600CONFIG_WLAN=y
571# CONFIG_WLAN_PRE80211 is not set 601# CONFIG_HOSTAP is not set
572# CONFIG_WLAN_80211 is not set
573 602
574# 603#
575# Enable WiMAX (Networking options) to see the WiMAX drivers 604# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -614,6 +643,7 @@ CONFIG_SERIAL_CORE=y
614CONFIG_SERIAL_CORE_CONSOLE=y 643CONFIG_SERIAL_CORE_CONSOLE=y
615CONFIG_SERIAL_CPM=y 644CONFIG_SERIAL_CPM=y
616CONFIG_SERIAL_CPM_CONSOLE=y 645CONFIG_SERIAL_CPM_CONSOLE=y
646# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
617CONFIG_UNIX98_PTYS=y 647CONFIG_UNIX98_PTYS=y
618# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 648# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
619# CONFIG_LEGACY_PTYS is not set 649# CONFIG_LEGACY_PTYS is not set
@@ -863,6 +893,7 @@ CONFIG_DEBUG_FS=y
863# CONFIG_DEBUG_MEMORY_INIT is not set 893# CONFIG_DEBUG_MEMORY_INIT is not set
864# CONFIG_RCU_CPU_STALL_DETECTOR is not set 894# CONFIG_RCU_CPU_STALL_DETECTOR is not set
865# CONFIG_LATENCYTOP is not set 895# CONFIG_LATENCYTOP is not set
896# CONFIG_SYSCTL_SYSCALL_CHECK is not set
866CONFIG_HAVE_FUNCTION_TRACER=y 897CONFIG_HAVE_FUNCTION_TRACER=y
867CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 898CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
868CONFIG_HAVE_DYNAMIC_FTRACE=y 899CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -887,7 +918,11 @@ CONFIG_PRINT_STACK_DEPTH=64
887# CONFIG_KEYS is not set 918# CONFIG_KEYS is not set
888# CONFIG_SECURITY is not set 919# CONFIG_SECURITY is not set
889# CONFIG_SECURITYFS is not set 920# CONFIG_SECURITYFS is not set
890# CONFIG_SECURITY_FILE_CAPABILITIES is not set 921# CONFIG_DEFAULT_SECURITY_SELINUX is not set
922# CONFIG_DEFAULT_SECURITY_SMACK is not set
923# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
924CONFIG_DEFAULT_SECURITY_DAC=y
925CONFIG_DEFAULT_SECURITY=""
891CONFIG_CRYPTO=y 926CONFIG_CRYPTO=y
892 927
893# 928#
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 523d5fe18c0e..61cf73d0000f 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc4 3# Linux kernel version: 2.6.33-rc2
4# Thu Oct 15 10:33:21 2009 4# Wed Dec 30 15:08:52 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62CONFIG_ARCH_SUSPEND_POSSIBLE=y 64CONFIG_ARCH_SUSPEND_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
@@ -87,6 +89,7 @@ CONFIG_SYSVIPC_SYSCTL=y
87# 89#
88CONFIG_TREE_RCU=y 90CONFIG_TREE_RCU=y
89# CONFIG_TREE_PREEMPT_RCU is not set 91# CONFIG_TREE_PREEMPT_RCU is not set
92# CONFIG_TINY_RCU is not set
90# CONFIG_RCU_TRACE is not set 93# CONFIG_RCU_TRACE is not set
91CONFIG_RCU_FANOUT=32 94CONFIG_RCU_FANOUT=32
92# CONFIG_RCU_FANOUT_EXACT is not set 95# CONFIG_RCU_FANOUT_EXACT is not set
@@ -170,14 +173,41 @@ CONFIG_LBDAF=y
170# IO Schedulers 173# IO Schedulers
171# 174#
172CONFIG_IOSCHED_NOOP=y 175CONFIG_IOSCHED_NOOP=y
173CONFIG_IOSCHED_AS=y
174CONFIG_IOSCHED_DEADLINE=y 176CONFIG_IOSCHED_DEADLINE=y
175CONFIG_IOSCHED_CFQ=y 177CONFIG_IOSCHED_CFQ=y
176CONFIG_DEFAULT_AS=y
177# CONFIG_DEFAULT_DEADLINE is not set 178# CONFIG_DEFAULT_DEADLINE is not set
178# CONFIG_DEFAULT_CFQ is not set 179CONFIG_DEFAULT_CFQ=y
179# CONFIG_DEFAULT_NOOP is not set 180# CONFIG_DEFAULT_NOOP is not set
180CONFIG_DEFAULT_IOSCHED="anticipatory" 181CONFIG_DEFAULT_IOSCHED="cfq"
182# CONFIG_INLINE_SPIN_TRYLOCK is not set
183# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
184# CONFIG_INLINE_SPIN_LOCK is not set
185# CONFIG_INLINE_SPIN_LOCK_BH is not set
186# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
187# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
188CONFIG_INLINE_SPIN_UNLOCK=y
189# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
190CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
191# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_READ_TRYLOCK is not set
193# CONFIG_INLINE_READ_LOCK is not set
194# CONFIG_INLINE_READ_LOCK_BH is not set
195# CONFIG_INLINE_READ_LOCK_IRQ is not set
196# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
197CONFIG_INLINE_READ_UNLOCK=y
198# CONFIG_INLINE_READ_UNLOCK_BH is not set
199CONFIG_INLINE_READ_UNLOCK_IRQ=y
200# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
201# CONFIG_INLINE_WRITE_TRYLOCK is not set
202# CONFIG_INLINE_WRITE_LOCK is not set
203# CONFIG_INLINE_WRITE_LOCK_BH is not set
204# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
205# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
206CONFIG_INLINE_WRITE_UNLOCK=y
207# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
208CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
209# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
210# CONFIG_MUTEX_SPIN_ON_OWNER is not set
181CONFIG_FREEZER=y 211CONFIG_FREEZER=y
182 212
183# 213#
@@ -193,6 +223,7 @@ CONFIG_PPC_LITE5200=y
193CONFIG_PPC_MEDIA5200=y 223CONFIG_PPC_MEDIA5200=y
194CONFIG_PPC_MPC5200_BUGFIX=y 224CONFIG_PPC_MPC5200_BUGFIX=y
195CONFIG_PPC_MPC5200_GPIO=y 225CONFIG_PPC_MPC5200_GPIO=y
226CONFIG_PPC_MPC5200_LPBFIFO=m
196# CONFIG_PPC_PMAC is not set 227# CONFIG_PPC_PMAC is not set
197# CONFIG_PPC_CELL is not set 228# CONFIG_PPC_CELL is not set
198# CONFIG_PPC_CELL_NATIVE is not set 229# CONFIG_PPC_CELL_NATIVE is not set
@@ -211,6 +242,7 @@ CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
211# CONFIG_PPC_I8259 is not set 242# CONFIG_PPC_I8259 is not set
212CONFIG_PPC_RTAS=y 243CONFIG_PPC_RTAS=y
213# CONFIG_RTAS_ERROR_LOGGING is not set 244# CONFIG_RTAS_ERROR_LOGGING is not set
245# CONFIG_PPC_RTAS_DAEMON is not set
214CONFIG_RTAS_PROC=y 246CONFIG_RTAS_PROC=y
215# CONFIG_MMIO_NVRAM is not set 247# CONFIG_MMIO_NVRAM is not set
216# CONFIG_PPC_MPC106 is not set 248# CONFIG_PPC_MPC106 is not set
@@ -223,6 +255,7 @@ CONFIG_RTAS_PROC=y
223CONFIG_PPC_BESTCOMM=y 255CONFIG_PPC_BESTCOMM=y
224CONFIG_PPC_BESTCOMM_ATA=y 256CONFIG_PPC_BESTCOMM_ATA=y
225CONFIG_PPC_BESTCOMM_FEC=y 257CONFIG_PPC_BESTCOMM_FEC=y
258CONFIG_PPC_BESTCOMM_GEN_BD=m
226CONFIG_SIMPLE_GPIO=y 259CONFIG_SIMPLE_GPIO=y
227 260
228# 261#
@@ -253,6 +286,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
254# CONFIG_KEXEC is not set 287# CONFIG_KEXEC is not set
255# CONFIG_CRASH_DUMP is not set 288# CONFIG_CRASH_DUMP is not set
289CONFIG_SPARSE_IRQ=y
256CONFIG_MAX_ACTIVE_REGIONS=32 290CONFIG_MAX_ACTIVE_REGIONS=32
257CONFIG_ARCH_FLATMEM_ENABLE=y 291CONFIG_ARCH_FLATMEM_ENABLE=y
258CONFIG_ARCH_POPULATES_NODE_MAP=y 292CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -269,8 +303,6 @@ CONFIG_MIGRATION=y
269CONFIG_ZONE_DMA_FLAG=1 303CONFIG_ZONE_DMA_FLAG=1
270CONFIG_BOUNCE=y 304CONFIG_BOUNCE=y
271CONFIG_VIRT_TO_BUS=y 305CONFIG_VIRT_TO_BUS=y
272CONFIG_HAVE_MLOCK=y
273CONFIG_HAVE_MLOCKED_PAGE_BIT=y
274# CONFIG_KSM is not set 306# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 307CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276CONFIG_PPC_4K_PAGES=y 308CONFIG_PPC_4K_PAGES=y
@@ -286,6 +318,7 @@ CONFIG_PM=y
286CONFIG_PM_SLEEP=y 318CONFIG_PM_SLEEP=y
287CONFIG_SUSPEND=y 319CONFIG_SUSPEND=y
288CONFIG_SUSPEND_FREEZER=y 320CONFIG_SUSPEND_FREEZER=y
321# CONFIG_HIBERNATION is not set
289# CONFIG_PM_RUNTIME is not set 322# CONFIG_PM_RUNTIME is not set
290CONFIG_SECCOMP=y 323CONFIG_SECCOMP=y
291CONFIG_ISA_DMA_API=y 324CONFIG_ISA_DMA_API=y
@@ -399,7 +432,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
399# CONFIG_IRDA is not set 432# CONFIG_IRDA is not set
400# CONFIG_BT is not set 433# CONFIG_BT is not set
401# CONFIG_AF_RXRPC is not set 434# CONFIG_AF_RXRPC is not set
402# CONFIG_WIRELESS is not set 435CONFIG_WIRELESS=y
436# CONFIG_CFG80211 is not set
437# CONFIG_LIB80211 is not set
438
439#
440# CFG80211 needs to be enabled for MAC80211
441#
403# CONFIG_WIMAX is not set 442# CONFIG_WIMAX is not set
404# CONFIG_RFKILL is not set 443# CONFIG_RFKILL is not set
405# CONFIG_NET_9P is not set 444# CONFIG_NET_9P is not set
@@ -530,6 +569,10 @@ CONFIG_BLK_DEV=y
530# CONFIG_BLK_DEV_COW_COMMON is not set 569# CONFIG_BLK_DEV_COW_COMMON is not set
531CONFIG_BLK_DEV_LOOP=y 570CONFIG_BLK_DEV_LOOP=y
532# CONFIG_BLK_DEV_CRYPTOLOOP is not set 571# CONFIG_BLK_DEV_CRYPTOLOOP is not set
572
573#
574# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
575#
533# CONFIG_BLK_DEV_NBD is not set 576# CONFIG_BLK_DEV_NBD is not set
534# CONFIG_BLK_DEV_SX8 is not set 577# CONFIG_BLK_DEV_SX8 is not set
535# CONFIG_BLK_DEV_UB is not set 578# CONFIG_BLK_DEV_UB is not set
@@ -541,6 +584,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
541# CONFIG_ATA_OVER_ETH is not set 584# CONFIG_ATA_OVER_ETH is not set
542# CONFIG_BLK_DEV_HD is not set 585# CONFIG_BLK_DEV_HD is not set
543CONFIG_MISC_DEVICES=y 586CONFIG_MISC_DEVICES=y
587# CONFIG_AD525X_DPOT is not set
544# CONFIG_PHANTOM is not set 588# CONFIG_PHANTOM is not set
545# CONFIG_SGI_IOC4 is not set 589# CONFIG_SGI_IOC4 is not set
546# CONFIG_TIFM_CORE is not set 590# CONFIG_TIFM_CORE is not set
@@ -548,6 +592,8 @@ CONFIG_MISC_DEVICES=y
548# CONFIG_ENCLOSURE_SERVICES is not set 592# CONFIG_ENCLOSURE_SERVICES is not set
549# CONFIG_HP_ILO is not set 593# CONFIG_HP_ILO is not set
550# CONFIG_ISL29003 is not set 594# CONFIG_ISL29003 is not set
595# CONFIG_DS1682 is not set
596# CONFIG_TI_DAC7512 is not set
551# CONFIG_C2PORT is not set 597# CONFIG_C2PORT is not set
552 598
553# 599#
@@ -600,7 +646,9 @@ CONFIG_SCSI_LOWLEVEL=y
600# CONFIG_SCSI_BNX2_ISCSI is not set 646# CONFIG_SCSI_BNX2_ISCSI is not set
601# CONFIG_BE2ISCSI is not set 647# CONFIG_BE2ISCSI is not set
602# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 648# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
649# CONFIG_SCSI_HPSA is not set
603# CONFIG_SCSI_3W_9XXX is not set 650# CONFIG_SCSI_3W_9XXX is not set
651# CONFIG_SCSI_3W_SAS is not set
604# CONFIG_SCSI_ACARD is not set 652# CONFIG_SCSI_ACARD is not set
605# CONFIG_SCSI_AACRAID is not set 653# CONFIG_SCSI_AACRAID is not set
606# CONFIG_SCSI_AIC7XXX is not set 654# CONFIG_SCSI_AIC7XXX is not set
@@ -639,6 +687,7 @@ CONFIG_SCSI_LOWLEVEL=y
639# CONFIG_SCSI_NSP32 is not set 687# CONFIG_SCSI_NSP32 is not set
640# CONFIG_SCSI_DEBUG is not set 688# CONFIG_SCSI_DEBUG is not set
641# CONFIG_SCSI_PMCRAID is not set 689# CONFIG_SCSI_PMCRAID is not set
690# CONFIG_SCSI_PM8001 is not set
642# CONFIG_SCSI_SRP is not set 691# CONFIG_SCSI_SRP is not set
643# CONFIG_SCSI_BFA_FC is not set 692# CONFIG_SCSI_BFA_FC is not set
644# CONFIG_SCSI_DH is not set 693# CONFIG_SCSI_DH is not set
@@ -694,15 +743,16 @@ CONFIG_PATA_MPC52xx=y
694# CONFIG_PATA_NS87415 is not set 743# CONFIG_PATA_NS87415 is not set
695# CONFIG_PATA_OPTI is not set 744# CONFIG_PATA_OPTI is not set
696# CONFIG_PATA_OPTIDMA is not set 745# CONFIG_PATA_OPTIDMA is not set
746# CONFIG_PATA_PDC2027X is not set
697# CONFIG_PATA_PDC_OLD is not set 747# CONFIG_PATA_PDC_OLD is not set
698# CONFIG_PATA_RADISYS is not set 748# CONFIG_PATA_RADISYS is not set
699# CONFIG_PATA_RDC is not set 749# CONFIG_PATA_RDC is not set
700# CONFIG_PATA_RZ1000 is not set 750# CONFIG_PATA_RZ1000 is not set
701# CONFIG_PATA_SC1200 is not set 751# CONFIG_PATA_SC1200 is not set
702# CONFIG_PATA_SERVERWORKS is not set 752# CONFIG_PATA_SERVERWORKS is not set
703# CONFIG_PATA_PDC2027X is not set
704# CONFIG_PATA_SIL680 is not set 753# CONFIG_PATA_SIL680 is not set
705# CONFIG_PATA_SIS is not set 754# CONFIG_PATA_SIS is not set
755# CONFIG_PATA_TOSHIBA is not set
706# CONFIG_PATA_VIA is not set 756# CONFIG_PATA_VIA is not set
707# CONFIG_PATA_WINBOND is not set 757# CONFIG_PATA_WINBOND is not set
708CONFIG_PATA_PLATFORM=y 758CONFIG_PATA_PLATFORM=y
@@ -785,8 +835,11 @@ CONFIG_FEC_MPC52xx_MDIO=y
785# CONFIG_NETDEV_10000 is not set 835# CONFIG_NETDEV_10000 is not set
786# CONFIG_TR is not set 836# CONFIG_TR is not set
787CONFIG_WLAN=y 837CONFIG_WLAN=y
788# CONFIG_WLAN_PRE80211 is not set 838# CONFIG_AIRO is not set
789# CONFIG_WLAN_80211 is not set 839# CONFIG_ATMEL is not set
840# CONFIG_PRISM54 is not set
841# CONFIG_USB_ZD1201 is not set
842# CONFIG_HOSTAP is not set
790 843
791# 844#
792# Enable WiMAX (Networking options) to see the WiMAX drivers 845# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -809,6 +862,7 @@ CONFIG_WLAN=y
809# CONFIG_NETCONSOLE is not set 862# CONFIG_NETCONSOLE is not set
810# CONFIG_NETPOLL is not set 863# CONFIG_NETPOLL is not set
811# CONFIG_NET_POLL_CONTROLLER is not set 864# CONFIG_NET_POLL_CONTROLLER is not set
865# CONFIG_VMXNET3 is not set
812# CONFIG_ISDN is not set 866# CONFIG_ISDN is not set
813# CONFIG_PHONE is not set 867# CONFIG_PHONE is not set
814 868
@@ -818,6 +872,7 @@ CONFIG_WLAN=y
818CONFIG_INPUT=y 872CONFIG_INPUT=y
819# CONFIG_INPUT_FF_MEMLESS is not set 873# CONFIG_INPUT_FF_MEMLESS is not set
820# CONFIG_INPUT_POLLDEV is not set 874# CONFIG_INPUT_POLLDEV is not set
875# CONFIG_INPUT_SPARSEKMAP is not set
821 876
822# 877#
823# Userland interfaces 878# Userland interfaces
@@ -874,6 +929,7 @@ CONFIG_SERIAL_MPC52xx=y
874CONFIG_SERIAL_MPC52xx_CONSOLE=y 929CONFIG_SERIAL_MPC52xx_CONSOLE=y
875CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 930CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
876# CONFIG_SERIAL_JSM is not set 931# CONFIG_SERIAL_JSM is not set
932# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
877CONFIG_UNIX98_PTYS=y 933CONFIG_UNIX98_PTYS=y
878# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 934# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
879CONFIG_LEGACY_PTYS=y 935CONFIG_LEGACY_PTYS=y
@@ -934,11 +990,6 @@ CONFIG_I2C_MPC=y
934# CONFIG_I2C_TINY_USB is not set 990# CONFIG_I2C_TINY_USB is not set
935 991
936# 992#
937# Graphics adapter I2C/DDC channel drivers
938#
939# CONFIG_I2C_VOODOO3 is not set
940
941#
942# Other I2C/SMBus bus drivers 993# Other I2C/SMBus bus drivers
943# 994#
944# CONFIG_I2C_PCA_PLATFORM is not set 995# CONFIG_I2C_PCA_PLATFORM is not set
@@ -947,7 +998,6 @@ CONFIG_I2C_MPC=y
947# 998#
948# Miscellaneous I2C Chip support 999# Miscellaneous I2C Chip support
949# 1000#
950# CONFIG_DS1682 is not set
951# CONFIG_SENSORS_TSL2550 is not set 1001# CONFIG_SENSORS_TSL2550 is not set
952# CONFIG_I2C_DEBUG_CORE is not set 1002# CONFIG_I2C_DEBUG_CORE is not set
953# CONFIG_I2C_DEBUG_ALGO is not set 1003# CONFIG_I2C_DEBUG_ALGO is not set
@@ -962,7 +1012,10 @@ CONFIG_SPI_MASTER=y
962# 1012#
963# CONFIG_SPI_BITBANG is not set 1013# CONFIG_SPI_BITBANG is not set
964# CONFIG_SPI_GPIO is not set 1014# CONFIG_SPI_GPIO is not set
1015# CONFIG_SPI_MPC52xx is not set
965CONFIG_SPI_MPC52xx_PSC=m 1016CONFIG_SPI_MPC52xx_PSC=m
1017# CONFIG_SPI_XILINX is not set
1018# CONFIG_SPI_DESIGNWARE is not set
966 1019
967# 1020#
968# SPI Protocol Masters 1021# SPI Protocol Masters
@@ -995,6 +1048,7 @@ CONFIG_GPIOLIB=y
995# 1048#
996# PCI GPIO expanders: 1049# PCI GPIO expanders:
997# 1050#
1051# CONFIG_GPIO_CS5535 is not set
998# CONFIG_GPIO_BT8XX is not set 1052# CONFIG_GPIO_BT8XX is not set
999# CONFIG_GPIO_LANGWELL is not set 1053# CONFIG_GPIO_LANGWELL is not set
1000 1054
@@ -1042,6 +1096,7 @@ CONFIG_HWMON=y
1042# CONFIG_SENSORS_IT87 is not set 1096# CONFIG_SENSORS_IT87 is not set
1043# CONFIG_SENSORS_LM63 is not set 1097# CONFIG_SENSORS_LM63 is not set
1044# CONFIG_SENSORS_LM70 is not set 1098# CONFIG_SENSORS_LM70 is not set
1099# CONFIG_SENSORS_LM73 is not set
1045# CONFIG_SENSORS_LM75 is not set 1100# CONFIG_SENSORS_LM75 is not set
1046# CONFIG_SENSORS_LM77 is not set 1101# CONFIG_SENSORS_LM77 is not set
1047# CONFIG_SENSORS_LM78 is not set 1102# CONFIG_SENSORS_LM78 is not set
@@ -1083,6 +1138,7 @@ CONFIG_HWMON=y
1083# CONFIG_SENSORS_W83627HF is not set 1138# CONFIG_SENSORS_W83627HF is not set
1084# CONFIG_SENSORS_W83627EHF is not set 1139# CONFIG_SENSORS_W83627EHF is not set
1085# CONFIG_SENSORS_LIS3_SPI is not set 1140# CONFIG_SENSORS_LIS3_SPI is not set
1141# CONFIG_SENSORS_LIS3_I2C is not set
1086# CONFIG_THERMAL is not set 1142# CONFIG_THERMAL is not set
1087CONFIG_WATCHDOG=y 1143CONFIG_WATCHDOG=y
1088# CONFIG_WATCHDOG_NOWAYOUT is not set 1144# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1122,6 +1178,7 @@ CONFIG_SSB_POSSIBLE=y
1122# CONFIG_TWL4030_CORE is not set 1178# CONFIG_TWL4030_CORE is not set
1123# CONFIG_MFD_TMIO is not set 1179# CONFIG_MFD_TMIO is not set
1124# CONFIG_PMIC_DA903X is not set 1180# CONFIG_PMIC_DA903X is not set
1181# CONFIG_PMIC_ADP5520 is not set
1125# CONFIG_MFD_WM8400 is not set 1182# CONFIG_MFD_WM8400 is not set
1126# CONFIG_MFD_WM831X is not set 1183# CONFIG_MFD_WM831X is not set
1127# CONFIG_MFD_WM8350_I2C is not set 1184# CONFIG_MFD_WM8350_I2C is not set
@@ -1129,6 +1186,8 @@ CONFIG_SSB_POSSIBLE=y
1129# CONFIG_MFD_MC13783 is not set 1186# CONFIG_MFD_MC13783 is not set
1130# CONFIG_AB3100_CORE is not set 1187# CONFIG_AB3100_CORE is not set
1131# CONFIG_EZX_PCAP is not set 1188# CONFIG_EZX_PCAP is not set
1189# CONFIG_MFD_88PM8607 is not set
1190# CONFIG_AB4500_CORE is not set
1132# CONFIG_REGULATOR is not set 1191# CONFIG_REGULATOR is not set
1133# CONFIG_MEDIA_SUPPORT is not set 1192# CONFIG_MEDIA_SUPPORT is not set
1134 1193
@@ -1322,7 +1381,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1322# CONFIG_USB_R8A66597_HCD is not set 1381# CONFIG_USB_R8A66597_HCD is not set
1323# CONFIG_USB_WHCI_HCD is not set 1382# CONFIG_USB_WHCI_HCD is not set
1324# CONFIG_USB_HWA_HCD is not set 1383# CONFIG_USB_HWA_HCD is not set
1325# CONFIG_USB_MUSB_HDRC is not set
1326 1384
1327# 1385#
1328# USB Device Class drivers 1386# USB Device Class drivers
@@ -1440,6 +1498,7 @@ CONFIG_RTC_DRV_DS1307=y
1440# CONFIG_RTC_DRV_PCF8563 is not set 1498# CONFIG_RTC_DRV_PCF8563 is not set
1441# CONFIG_RTC_DRV_PCF8583 is not set 1499# CONFIG_RTC_DRV_PCF8583 is not set
1442# CONFIG_RTC_DRV_M41T80 is not set 1500# CONFIG_RTC_DRV_M41T80 is not set
1501# CONFIG_RTC_DRV_BQ32K is not set
1443# CONFIG_RTC_DRV_S35390A is not set 1502# CONFIG_RTC_DRV_S35390A is not set
1444# CONFIG_RTC_DRV_FM3130 is not set 1503# CONFIG_RTC_DRV_FM3130 is not set
1445# CONFIG_RTC_DRV_RX8581 is not set 1504# CONFIG_RTC_DRV_RX8581 is not set
@@ -1469,7 +1528,9 @@ CONFIG_RTC_DRV_DS1307=y
1469# CONFIG_RTC_DRV_M48T86 is not set 1528# CONFIG_RTC_DRV_M48T86 is not set
1470# CONFIG_RTC_DRV_M48T35 is not set 1529# CONFIG_RTC_DRV_M48T35 is not set
1471# CONFIG_RTC_DRV_M48T59 is not set 1530# CONFIG_RTC_DRV_M48T59 is not set
1531# CONFIG_RTC_DRV_MSM6242 is not set
1472# CONFIG_RTC_DRV_BQ4802 is not set 1532# CONFIG_RTC_DRV_BQ4802 is not set
1533# CONFIG_RTC_DRV_RP5C01 is not set
1473# CONFIG_RTC_DRV_V3020 is not set 1534# CONFIG_RTC_DRV_V3020 is not set
1474 1535
1475# 1536#
@@ -1731,6 +1792,7 @@ CONFIG_DEBUG_INFO=y
1731# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1792# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1732# CONFIG_FAULT_INJECTION is not set 1793# CONFIG_FAULT_INJECTION is not set
1733# CONFIG_LATENCYTOP is not set 1794# CONFIG_LATENCYTOP is not set
1795# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1734# CONFIG_DEBUG_PAGEALLOC is not set 1796# CONFIG_DEBUG_PAGEALLOC is not set
1735CONFIG_HAVE_FUNCTION_TRACER=y 1797CONFIG_HAVE_FUNCTION_TRACER=y
1736CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1798CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1774,7 +1836,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1774# CONFIG_KEYS is not set 1836# CONFIG_KEYS is not set
1775# CONFIG_SECURITY is not set 1837# CONFIG_SECURITY is not set
1776# CONFIG_SECURITYFS is not set 1838# CONFIG_SECURITYFS is not set
1777# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1839# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1840# CONFIG_DEFAULT_SECURITY_SMACK is not set
1841# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1842CONFIG_DEFAULT_SECURITY_DAC=y
1843CONFIG_DEFAULT_SECURITY=""
1778CONFIG_CRYPTO=y 1844CONFIG_CRYPTO=y
1779 1845
1780# 1846#
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index d8b364a45944..1315b775a6d2 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:10 2009 4# Wed Jan 6 09:24:04 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60CONFIG_DEFAULT_UIMAGE=y 61CONFIG_DEFAULT_UIMAGE=y
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -167,14 +170,41 @@ CONFIG_LBDAF=y
167# IO Schedulers 170# IO Schedulers
168# 171#
169CONFIG_IOSCHED_NOOP=y 172CONFIG_IOSCHED_NOOP=y
170CONFIG_IOSCHED_AS=y
171CONFIG_IOSCHED_DEADLINE=y 173CONFIG_IOSCHED_DEADLINE=y
172CONFIG_IOSCHED_CFQ=y 174CONFIG_IOSCHED_CFQ=y
173CONFIG_DEFAULT_AS=y
174# CONFIG_DEFAULT_DEADLINE is not set 175# CONFIG_DEFAULT_DEADLINE is not set
175# CONFIG_DEFAULT_CFQ is not set 176CONFIG_DEFAULT_CFQ=y
176# CONFIG_DEFAULT_NOOP is not set 177# CONFIG_DEFAULT_NOOP is not set
177CONFIG_DEFAULT_IOSCHED="anticipatory" 178CONFIG_DEFAULT_IOSCHED="cfq"
179# CONFIG_INLINE_SPIN_TRYLOCK is not set
180# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
181# CONFIG_INLINE_SPIN_LOCK is not set
182# CONFIG_INLINE_SPIN_LOCK_BH is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
184# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
185CONFIG_INLINE_SPIN_UNLOCK=y
186# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
187CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
188# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
189# CONFIG_INLINE_READ_TRYLOCK is not set
190# CONFIG_INLINE_READ_LOCK is not set
191# CONFIG_INLINE_READ_LOCK_BH is not set
192# CONFIG_INLINE_READ_LOCK_IRQ is not set
193# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
194CONFIG_INLINE_READ_UNLOCK=y
195# CONFIG_INLINE_READ_UNLOCK_BH is not set
196CONFIG_INLINE_READ_UNLOCK_IRQ=y
197# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
198# CONFIG_INLINE_WRITE_TRYLOCK is not set
199# CONFIG_INLINE_WRITE_LOCK is not set
200# CONFIG_INLINE_WRITE_LOCK_BH is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
202# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
203CONFIG_INLINE_WRITE_UNLOCK=y
204# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
205CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
206# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
207# CONFIG_MUTEX_SPIN_ON_OWNER is not set
178# CONFIG_FREEZER is not set 208# CONFIG_FREEZER is not set
179 209
180# 210#
@@ -199,6 +229,8 @@ CONFIG_MPC7448HPC2=y
199# CONFIG_PPC_PRPMC2800 is not set 229# CONFIG_PPC_PRPMC2800 is not set
200# CONFIG_PPC_C2K is not set 230# CONFIG_PPC_C2K is not set
201CONFIG_TSI108_BRIDGE=y 231CONFIG_TSI108_BRIDGE=y
232# CONFIG_GAMECUBE is not set
233# CONFIG_WII is not set
202# CONFIG_AMIGAONE is not set 234# CONFIG_AMIGAONE is not set
203CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 235CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
204# CONFIG_IPIC is not set 236# CONFIG_IPIC is not set
@@ -244,6 +276,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 276CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245# CONFIG_KEXEC is not set 277# CONFIG_KEXEC is not set
246# CONFIG_CRASH_DUMP is not set 278# CONFIG_CRASH_DUMP is not set
279CONFIG_SPARSE_IRQ=y
247CONFIG_MAX_ACTIVE_REGIONS=32 280CONFIG_MAX_ACTIVE_REGIONS=32
248CONFIG_ARCH_FLATMEM_ENABLE=y 281CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_POPULATES_NODE_MAP=y 282CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -260,8 +293,6 @@ CONFIG_MIGRATION=y
260CONFIG_ZONE_DMA_FLAG=1 293CONFIG_ZONE_DMA_FLAG=1
261CONFIG_BOUNCE=y 294CONFIG_BOUNCE=y
262CONFIG_VIRT_TO_BUS=y 295CONFIG_VIRT_TO_BUS=y
263CONFIG_HAVE_MLOCK=y
264CONFIG_HAVE_MLOCKED_PAGE_BIT=y
265# CONFIG_KSM is not set 296# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 297CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267CONFIG_PPC_4K_PAGES=y 298CONFIG_PPC_4K_PAGES=y
@@ -385,9 +416,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_AF_RXRPC is not set 416# CONFIG_AF_RXRPC is not set
386CONFIG_WIRELESS=y 417CONFIG_WIRELESS=y
387# CONFIG_CFG80211 is not set 418# CONFIG_CFG80211 is not set
388CONFIG_CFG80211_DEFAULT_PS_VALUE=0
389CONFIG_WIRELESS_OLD_REGULATORY=y
390# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 419# CONFIG_LIB80211 is not set
392 420
393# 421#
@@ -424,6 +452,10 @@ CONFIG_BLK_DEV=y
424# CONFIG_BLK_DEV_COW_COMMON is not set 452# CONFIG_BLK_DEV_COW_COMMON is not set
425CONFIG_BLK_DEV_LOOP=y 453CONFIG_BLK_DEV_LOOP=y
426# CONFIG_BLK_DEV_CRYPTOLOOP is not set 454# CONFIG_BLK_DEV_CRYPTOLOOP is not set
455
456#
457# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
458#
427# CONFIG_BLK_DEV_NBD is not set 459# CONFIG_BLK_DEV_NBD is not set
428# CONFIG_BLK_DEV_SX8 is not set 460# CONFIG_BLK_DEV_SX8 is not set
429CONFIG_BLK_DEV_RAM=y 461CONFIG_BLK_DEV_RAM=y
@@ -487,7 +519,9 @@ CONFIG_SCSI_LOWLEVEL=y
487# CONFIG_SCSI_BNX2_ISCSI is not set 519# CONFIG_SCSI_BNX2_ISCSI is not set
488# CONFIG_BE2ISCSI is not set 520# CONFIG_BE2ISCSI is not set
489# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 521# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
522# CONFIG_SCSI_HPSA is not set
490# CONFIG_SCSI_3W_9XXX is not set 523# CONFIG_SCSI_3W_9XXX is not set
524# CONFIG_SCSI_3W_SAS is not set
491# CONFIG_SCSI_ACARD is not set 525# CONFIG_SCSI_ACARD is not set
492# CONFIG_SCSI_AACRAID is not set 526# CONFIG_SCSI_AACRAID is not set
493# CONFIG_SCSI_AIC7XXX is not set 527# CONFIG_SCSI_AIC7XXX is not set
@@ -526,6 +560,7 @@ CONFIG_SCSI_LOWLEVEL=y
526# CONFIG_SCSI_NSP32 is not set 560# CONFIG_SCSI_NSP32 is not set
527# CONFIG_SCSI_DEBUG is not set 561# CONFIG_SCSI_DEBUG is not set
528# CONFIG_SCSI_PMCRAID is not set 562# CONFIG_SCSI_PMCRAID is not set
563# CONFIG_SCSI_PM8001 is not set
529# CONFIG_SCSI_SRP is not set 564# CONFIG_SCSI_SRP is not set
530# CONFIG_SCSI_BFA_FC is not set 565# CONFIG_SCSI_BFA_FC is not set
531# CONFIG_SCSI_DH is not set 566# CONFIG_SCSI_DH is not set
@@ -580,15 +615,16 @@ CONFIG_SATA_MV=y
580# CONFIG_PATA_NS87415 is not set 615# CONFIG_PATA_NS87415 is not set
581# CONFIG_PATA_OPTI is not set 616# CONFIG_PATA_OPTI is not set
582# CONFIG_PATA_OPTIDMA is not set 617# CONFIG_PATA_OPTIDMA is not set
618# CONFIG_PATA_PDC2027X is not set
583# CONFIG_PATA_PDC_OLD is not set 619# CONFIG_PATA_PDC_OLD is not set
584# CONFIG_PATA_RADISYS is not set 620# CONFIG_PATA_RADISYS is not set
585# CONFIG_PATA_RDC is not set 621# CONFIG_PATA_RDC is not set
586# CONFIG_PATA_RZ1000 is not set 622# CONFIG_PATA_RZ1000 is not set
587# CONFIG_PATA_SC1200 is not set 623# CONFIG_PATA_SC1200 is not set
588# CONFIG_PATA_SERVERWORKS is not set 624# CONFIG_PATA_SERVERWORKS is not set
589# CONFIG_PATA_PDC2027X is not set
590# CONFIG_PATA_SIL680 is not set 625# CONFIG_PATA_SIL680 is not set
591# CONFIG_PATA_SIS is not set 626# CONFIG_PATA_SIS is not set
627# CONFIG_PATA_TOSHIBA is not set
592# CONFIG_PATA_VIA is not set 628# CONFIG_PATA_VIA is not set
593# CONFIG_PATA_WINBOND is not set 629# CONFIG_PATA_WINBOND is not set
594# CONFIG_PATA_PLATFORM is not set 630# CONFIG_PATA_PLATFORM is not set
@@ -605,7 +641,7 @@ CONFIG_SATA_MV=y
605# 641#
606 642
607# 643#
608# See the help texts for more information. 644# The newer stack is recommended.
609# 645#
610# CONFIG_FIREWIRE is not set 646# CONFIG_FIREWIRE is not set
611# CONFIG_IEEE1394 is not set 647# CONFIG_IEEE1394 is not set
@@ -731,8 +767,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
731# CONFIG_BE2NET is not set 767# CONFIG_BE2NET is not set
732# CONFIG_TR is not set 768# CONFIG_TR is not set
733CONFIG_WLAN=y 769CONFIG_WLAN=y
734# CONFIG_WLAN_PRE80211 is not set 770# CONFIG_AIRO is not set
735# CONFIG_WLAN_80211 is not set 771# CONFIG_ATMEL is not set
772# CONFIG_PRISM54 is not set
773# CONFIG_HOSTAP is not set
736 774
737# 775#
738# Enable WiMAX (Networking options) to see the WiMAX drivers 776# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -746,6 +784,7 @@ CONFIG_WLAN=y
746# CONFIG_NETCONSOLE is not set 784# CONFIG_NETCONSOLE is not set
747# CONFIG_NETPOLL is not set 785# CONFIG_NETPOLL is not set
748# CONFIG_NET_POLL_CONTROLLER is not set 786# CONFIG_NET_POLL_CONTROLLER is not set
787# CONFIG_VMXNET3 is not set
749# CONFIG_ISDN is not set 788# CONFIG_ISDN is not set
750# CONFIG_PHONE is not set 789# CONFIG_PHONE is not set
751 790
@@ -755,6 +794,7 @@ CONFIG_WLAN=y
755CONFIG_INPUT=y 794CONFIG_INPUT=y
756# CONFIG_INPUT_FF_MEMLESS is not set 795# CONFIG_INPUT_FF_MEMLESS is not set
757# CONFIG_INPUT_POLLDEV is not set 796# CONFIG_INPUT_POLLDEV is not set
797# CONFIG_INPUT_SPARSEKMAP is not set
758 798
759# 799#
760# Userland interfaces 800# Userland interfaces
@@ -806,6 +846,7 @@ CONFIG_SERIAL_CORE=y
806CONFIG_SERIAL_CORE_CONSOLE=y 846CONFIG_SERIAL_CORE_CONSOLE=y
807# CONFIG_SERIAL_JSM is not set 847# CONFIG_SERIAL_JSM is not set
808# CONFIG_SERIAL_OF_PLATFORM is not set 848# CONFIG_SERIAL_OF_PLATFORM is not set
849# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
809CONFIG_UNIX98_PTYS=y 850CONFIG_UNIX98_PTYS=y
810# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 851# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
811CONFIG_LEGACY_PTYS=y 852CONFIG_LEGACY_PTYS=y
@@ -1091,7 +1132,7 @@ CONFIG_FRAME_WARN=1024
1091# CONFIG_DEBUG_KERNEL is not set 1132# CONFIG_DEBUG_KERNEL is not set
1092# CONFIG_SLUB_DEBUG_ON is not set 1133# CONFIG_SLUB_DEBUG_ON is not set
1093# CONFIG_SLUB_STATS is not set 1134# CONFIG_SLUB_STATS is not set
1094# CONFIG_DEBUG_BUGVERBOSE is not set 1135CONFIG_DEBUG_BUGVERBOSE=y
1095# CONFIG_DEBUG_MEMORY_INIT is not set 1136# CONFIG_DEBUG_MEMORY_INIT is not set
1096# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1137# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1097# CONFIG_LATENCYTOP is not set 1138# CONFIG_LATENCYTOP is not set
@@ -1118,7 +1159,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1118# CONFIG_KEYS is not set 1159# CONFIG_KEYS is not set
1119# CONFIG_SECURITY is not set 1160# CONFIG_SECURITY is not set
1120# CONFIG_SECURITYFS is not set 1161# CONFIG_SECURITYFS is not set
1121# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1162# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1163# CONFIG_DEFAULT_SECURITY_SMACK is not set
1164# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1165CONFIG_DEFAULT_SECURITY_DAC=y
1166CONFIG_DEFAULT_SECURITY=""
1122CONFIG_CRYPTO=y 1167CONFIG_CRYPTO=y
1123 1168
1124# 1169#
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 00fad81b6fce..9073778d3575 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:11 2009 4# Wed Jan 6 09:24:05 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -161,14 +164,41 @@ CONFIG_BLK_DEV_BSG=y
161# IO Schedulers 164# IO Schedulers
162# 165#
163CONFIG_IOSCHED_NOOP=y 166CONFIG_IOSCHED_NOOP=y
164CONFIG_IOSCHED_AS=y
165CONFIG_IOSCHED_DEADLINE=y 167CONFIG_IOSCHED_DEADLINE=y
166CONFIG_IOSCHED_CFQ=y 168CONFIG_IOSCHED_CFQ=y
167CONFIG_DEFAULT_AS=y
168# CONFIG_DEFAULT_DEADLINE is not set 169# CONFIG_DEFAULT_DEADLINE is not set
169# CONFIG_DEFAULT_CFQ is not set 170CONFIG_DEFAULT_CFQ=y
170# CONFIG_DEFAULT_NOOP is not set 171# CONFIG_DEFAULT_NOOP is not set
171CONFIG_DEFAULT_IOSCHED="anticipatory" 172CONFIG_DEFAULT_IOSCHED="cfq"
173# CONFIG_INLINE_SPIN_TRYLOCK is not set
174# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
175# CONFIG_INLINE_SPIN_LOCK is not set
176# CONFIG_INLINE_SPIN_LOCK_BH is not set
177# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
178# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
179CONFIG_INLINE_SPIN_UNLOCK=y
180# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
181CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
182# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
183# CONFIG_INLINE_READ_TRYLOCK is not set
184# CONFIG_INLINE_READ_LOCK is not set
185# CONFIG_INLINE_READ_LOCK_BH is not set
186# CONFIG_INLINE_READ_LOCK_IRQ is not set
187# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
188CONFIG_INLINE_READ_UNLOCK=y
189# CONFIG_INLINE_READ_UNLOCK_BH is not set
190CONFIG_INLINE_READ_UNLOCK_IRQ=y
191# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
192# CONFIG_INLINE_WRITE_TRYLOCK is not set
193# CONFIG_INLINE_WRITE_LOCK is not set
194# CONFIG_INLINE_WRITE_LOCK_BH is not set
195# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
196# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
197CONFIG_INLINE_WRITE_UNLOCK=y
198# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
199CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
200# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
201# CONFIG_MUTEX_SPIN_ON_OWNER is not set
172# CONFIG_FREEZER is not set 202# CONFIG_FREEZER is not set
173 203
174# 204#
@@ -240,6 +270,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
240CONFIG_ARCH_HAS_WALK_MEMORY=y 270CONFIG_ARCH_HAS_WALK_MEMORY=y
241CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 271CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
242# CONFIG_CRASH_DUMP is not set 272# CONFIG_CRASH_DUMP is not set
273CONFIG_SPARSE_IRQ=y
243CONFIG_MAX_ACTIVE_REGIONS=32 274CONFIG_MAX_ACTIVE_REGIONS=32
244CONFIG_ARCH_FLATMEM_ENABLE=y 275CONFIG_ARCH_FLATMEM_ENABLE=y
245CONFIG_ARCH_POPULATES_NODE_MAP=y 276CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -252,8 +283,6 @@ CONFIG_MIGRATION=y
252CONFIG_ZONE_DMA_FLAG=1 283CONFIG_ZONE_DMA_FLAG=1
253CONFIG_BOUNCE=y 284CONFIG_BOUNCE=y
254CONFIG_VIRT_TO_BUS=y 285CONFIG_VIRT_TO_BUS=y
255CONFIG_HAVE_MLOCK=y
256CONFIG_HAVE_MLOCKED_PAGE_BIT=y
257# CONFIG_KSM is not set 286# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 287CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259CONFIG_PPC_4K_PAGES=y 288CONFIG_PPC_4K_PAGES=y
@@ -403,9 +432,6 @@ CONFIG_NETFILTER_ADVANCED=y
403# CONFIG_BT is not set 432# CONFIG_BT is not set
404CONFIG_WIRELESS=y 433CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 434# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
407CONFIG_WIRELESS_OLD_REGULATORY=y
408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set 435# CONFIG_LIB80211 is not set
410 436
411# 437#
@@ -526,6 +552,10 @@ CONFIG_BLK_DEV=y
526# CONFIG_BLK_DEV_COW_COMMON is not set 552# CONFIG_BLK_DEV_COW_COMMON is not set
527CONFIG_BLK_DEV_LOOP=y 553CONFIG_BLK_DEV_LOOP=y
528# CONFIG_BLK_DEV_CRYPTOLOOP is not set 554# CONFIG_BLK_DEV_CRYPTOLOOP is not set
555
556#
557# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
558#
529# CONFIG_BLK_DEV_NBD is not set 559# CONFIG_BLK_DEV_NBD is not set
530# CONFIG_BLK_DEV_SX8 is not set 560# CONFIG_BLK_DEV_SX8 is not set
531# CONFIG_BLK_DEV_RAM is not set 561# CONFIG_BLK_DEV_RAM is not set
@@ -556,7 +586,7 @@ CONFIG_HAVE_IDE=y
556# 586#
557 587
558# 588#
559# See the help texts for more information. 589# The newer stack is recommended.
560# 590#
561# CONFIG_FIREWIRE is not set 591# CONFIG_FIREWIRE is not set
562# CONFIG_IEEE1394 is not set 592# CONFIG_IEEE1394 is not set
@@ -661,8 +691,9 @@ CONFIG_CHELSIO_T3_DEPENDS=y
661# CONFIG_BE2NET is not set 691# CONFIG_BE2NET is not set
662# CONFIG_TR is not set 692# CONFIG_TR is not set
663CONFIG_WLAN=y 693CONFIG_WLAN=y
664# CONFIG_WLAN_PRE80211 is not set 694# CONFIG_AIRO is not set
665# CONFIG_WLAN_80211 is not set 695# CONFIG_ATMEL is not set
696# CONFIG_HOSTAP is not set
666 697
667# 698#
668# Enable WiMAX (Networking options) to see the WiMAX drivers 699# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -679,6 +710,7 @@ CONFIG_PPP_DEFLATE=y
679CONFIG_SLHC=y 710CONFIG_SLHC=y
680# CONFIG_NETPOLL is not set 711# CONFIG_NETPOLL is not set
681# CONFIG_NET_POLL_CONTROLLER is not set 712# CONFIG_NET_POLL_CONTROLLER is not set
713# CONFIG_VMXNET3 is not set
682# CONFIG_ISDN is not set 714# CONFIG_ISDN is not set
683# CONFIG_PHONE is not set 715# CONFIG_PHONE is not set
684 716
@@ -688,6 +720,7 @@ CONFIG_SLHC=y
688CONFIG_INPUT=y 720CONFIG_INPUT=y
689# CONFIG_INPUT_FF_MEMLESS is not set 721# CONFIG_INPUT_FF_MEMLESS is not set
690# CONFIG_INPUT_POLLDEV is not set 722# CONFIG_INPUT_POLLDEV is not set
723# CONFIG_INPUT_SPARSEKMAP is not set
691 724
692# 725#
693# Userland interfaces 726# Userland interfaces
@@ -740,6 +773,7 @@ CONFIG_SERIO_SERPORT=y
740CONFIG_SERIO_LIBPS2=y 773CONFIG_SERIO_LIBPS2=y
741# CONFIG_SERIO_RAW is not set 774# CONFIG_SERIO_RAW is not set
742# CONFIG_SERIO_XILINX_XPS_PS2 is not set 775# CONFIG_SERIO_XILINX_XPS_PS2 is not set
776# CONFIG_SERIO_ALTERA_PS2 is not set
743# CONFIG_GAMEPORT is not set 777# CONFIG_GAMEPORT is not set
744 778
745# 779#
@@ -763,6 +797,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
763CONFIG_SERIAL_CPM=y 797CONFIG_SERIAL_CPM=y
764CONFIG_SERIAL_CPM_CONSOLE=y 798CONFIG_SERIAL_CPM_CONSOLE=y
765# CONFIG_SERIAL_JSM is not set 799# CONFIG_SERIAL_JSM is not set
800# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
766CONFIG_UNIX98_PTYS=y 801CONFIG_UNIX98_PTYS=y
767# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 802# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
768CONFIG_LEGACY_PTYS=y 803CONFIG_LEGACY_PTYS=y
@@ -799,6 +834,7 @@ CONFIG_GPIOLIB=y
799# 834#
800# PCI GPIO expanders: 835# PCI GPIO expanders:
801# 836#
837# CONFIG_GPIO_CS5535 is not set
802# CONFIG_GPIO_BT8XX is not set 838# CONFIG_GPIO_BT8XX is not set
803# CONFIG_GPIO_LANGWELL is not set 839# CONFIG_GPIO_LANGWELL is not set
804 840
@@ -1131,7 +1167,11 @@ CONFIG_BDI_SWITCH=y
1131# CONFIG_KEYS is not set 1167# CONFIG_KEYS is not set
1132# CONFIG_SECURITY is not set 1168# CONFIG_SECURITY is not set
1133# CONFIG_SECURITYFS is not set 1169# CONFIG_SECURITYFS is not set
1134# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1170# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1171# CONFIG_DEFAULT_SECURITY_SMACK is not set
1172# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1173CONFIG_DEFAULT_SECURITY_DAC=y
1174CONFIG_DEFAULT_SECURITY=""
1135CONFIG_CRYPTO=y 1175CONFIG_CRYPTO=y
1136 1176
1137# 1177#
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 64dff21516cb..05bec4835687 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:12 2009 4# Wed Jan 6 09:24:06 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -37,6 +37,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 37# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 38# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
39CONFIG_IRQ_PER_CPU=y 39CONFIG_IRQ_PER_CPU=y
40CONFIG_NR_IRQS=512
40CONFIG_STACKTRACE_SUPPORT=y 41CONFIG_STACKTRACE_SUPPORT=y
41CONFIG_HAVE_LATENCYTOP_SUPPORT=y 42CONFIG_HAVE_LATENCYTOP_SUPPORT=y
42CONFIG_TRACE_IRQFLAGS_SUPPORT=y 43CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,7 @@ CONFIG_GENERIC_BUG=y
61CONFIG_DTC=y 62CONFIG_DTC=y
62CONFIG_DEFAULT_UIMAGE=y 63CONFIG_DEFAULT_UIMAGE=y
63CONFIG_REDBOOT=y 64CONFIG_REDBOOT=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
64CONFIG_ARCH_SUSPEND_POSSIBLE=y 66CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
@@ -89,6 +91,7 @@ CONFIG_SYSVIPC_SYSCTL=y
89# 91#
90CONFIG_TREE_RCU=y 92CONFIG_TREE_RCU=y
91# CONFIG_TREE_PREEMPT_RCU is not set 93# CONFIG_TREE_PREEMPT_RCU is not set
94# CONFIG_TINY_RCU is not set
92# CONFIG_RCU_TRACE is not set 95# CONFIG_RCU_TRACE is not set
93CONFIG_RCU_FANOUT=32 96CONFIG_RCU_FANOUT=32
94# CONFIG_RCU_FANOUT_EXACT is not set 97# CONFIG_RCU_FANOUT_EXACT is not set
@@ -176,14 +179,41 @@ CONFIG_LBDAF=y
176# IO Schedulers 179# IO Schedulers
177# 180#
178CONFIG_IOSCHED_NOOP=y 181CONFIG_IOSCHED_NOOP=y
179CONFIG_IOSCHED_AS=y
180CONFIG_IOSCHED_DEADLINE=y 182CONFIG_IOSCHED_DEADLINE=y
181CONFIG_IOSCHED_CFQ=y 183CONFIG_IOSCHED_CFQ=y
182CONFIG_DEFAULT_AS=y
183# CONFIG_DEFAULT_DEADLINE is not set 184# CONFIG_DEFAULT_DEADLINE is not set
184# CONFIG_DEFAULT_CFQ is not set 185CONFIG_DEFAULT_CFQ=y
185# CONFIG_DEFAULT_NOOP is not set 186# CONFIG_DEFAULT_NOOP is not set
186CONFIG_DEFAULT_IOSCHED="anticipatory" 187CONFIG_DEFAULT_IOSCHED="cfq"
188# CONFIG_INLINE_SPIN_TRYLOCK is not set
189# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
190# CONFIG_INLINE_SPIN_LOCK is not set
191# CONFIG_INLINE_SPIN_LOCK_BH is not set
192# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
193# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
194CONFIG_INLINE_SPIN_UNLOCK=y
195# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
196CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
197# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
198# CONFIG_INLINE_READ_TRYLOCK is not set
199# CONFIG_INLINE_READ_LOCK is not set
200# CONFIG_INLINE_READ_LOCK_BH is not set
201# CONFIG_INLINE_READ_LOCK_IRQ is not set
202# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
203CONFIG_INLINE_READ_UNLOCK=y
204# CONFIG_INLINE_READ_UNLOCK_BH is not set
205CONFIG_INLINE_READ_UNLOCK_IRQ=y
206# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
207# CONFIG_INLINE_WRITE_TRYLOCK is not set
208# CONFIG_INLINE_WRITE_LOCK is not set
209# CONFIG_INLINE_WRITE_LOCK_BH is not set
210# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
211# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
212CONFIG_INLINE_WRITE_UNLOCK=y
213# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
214CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
215# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
216# CONFIG_MUTEX_SPIN_ON_OWNER is not set
187# CONFIG_FREEZER is not set 217# CONFIG_FREEZER is not set
188 218
189# 219#
@@ -266,6 +296,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
266CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 296CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
267# CONFIG_KEXEC is not set 297# CONFIG_KEXEC is not set
268# CONFIG_CRASH_DUMP is not set 298# CONFIG_CRASH_DUMP is not set
299CONFIG_SPARSE_IRQ=y
269CONFIG_MAX_ACTIVE_REGIONS=32 300CONFIG_MAX_ACTIVE_REGIONS=32
270CONFIG_ARCH_FLATMEM_ENABLE=y 301CONFIG_ARCH_FLATMEM_ENABLE=y
271CONFIG_ARCH_POPULATES_NODE_MAP=y 302CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -282,8 +313,6 @@ CONFIG_MIGRATION=y
282CONFIG_ZONE_DMA_FLAG=1 313CONFIG_ZONE_DMA_FLAG=1
283CONFIG_BOUNCE=y 314CONFIG_BOUNCE=y
284CONFIG_VIRT_TO_BUS=y 315CONFIG_VIRT_TO_BUS=y
285CONFIG_HAVE_MLOCK=y
286CONFIG_HAVE_MLOCKED_PAGE_BIT=y
287# CONFIG_KSM is not set 316# CONFIG_KSM is not set
288CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 317CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
289CONFIG_PPC_4K_PAGES=y 318CONFIG_PPC_4K_PAGES=y
@@ -413,9 +442,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
413# CONFIG_AF_RXRPC is not set 442# CONFIG_AF_RXRPC is not set
414CONFIG_WIRELESS=y 443CONFIG_WIRELESS=y
415# CONFIG_CFG80211 is not set 444# CONFIG_CFG80211 is not set
416CONFIG_CFG80211_DEFAULT_PS_VALUE=0
417CONFIG_WIRELESS_OLD_REGULATORY=y
418# CONFIG_WIRELESS_EXT is not set
419# CONFIG_LIB80211 is not set 445# CONFIG_LIB80211 is not set
420 446
421# 447#
@@ -548,6 +574,10 @@ CONFIG_BLK_DEV=y
548# CONFIG_BLK_DEV_COW_COMMON is not set 574# CONFIG_BLK_DEV_COW_COMMON is not set
549CONFIG_BLK_DEV_LOOP=y 575CONFIG_BLK_DEV_LOOP=y
550# CONFIG_BLK_DEV_CRYPTOLOOP is not set 576# CONFIG_BLK_DEV_CRYPTOLOOP is not set
577
578#
579# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
580#
551# CONFIG_BLK_DEV_NBD is not set 581# CONFIG_BLK_DEV_NBD is not set
552# CONFIG_BLK_DEV_SX8 is not set 582# CONFIG_BLK_DEV_SX8 is not set
553# CONFIG_BLK_DEV_UB is not set 583# CONFIG_BLK_DEV_UB is not set
@@ -559,6 +589,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
559# CONFIG_ATA_OVER_ETH is not set 589# CONFIG_ATA_OVER_ETH is not set
560# CONFIG_BLK_DEV_HD is not set 590# CONFIG_BLK_DEV_HD is not set
561CONFIG_MISC_DEVICES=y 591CONFIG_MISC_DEVICES=y
592# CONFIG_AD525X_DPOT is not set
562# CONFIG_PHANTOM is not set 593# CONFIG_PHANTOM is not set
563# CONFIG_SGI_IOC4 is not set 594# CONFIG_SGI_IOC4 is not set
564# CONFIG_TIFM_CORE is not set 595# CONFIG_TIFM_CORE is not set
@@ -566,6 +597,7 @@ CONFIG_MISC_DEVICES=y
566# CONFIG_ENCLOSURE_SERVICES is not set 597# CONFIG_ENCLOSURE_SERVICES is not set
567# CONFIG_HP_ILO is not set 598# CONFIG_HP_ILO is not set
568# CONFIG_ISL29003 is not set 599# CONFIG_ISL29003 is not set
600# CONFIG_DS1682 is not set
569# CONFIG_C2PORT is not set 601# CONFIG_C2PORT is not set
570 602
571# 603#
@@ -618,7 +650,9 @@ CONFIG_SCSI_LOWLEVEL=y
618# CONFIG_SCSI_BNX2_ISCSI is not set 650# CONFIG_SCSI_BNX2_ISCSI is not set
619# CONFIG_BE2ISCSI is not set 651# CONFIG_BE2ISCSI is not set
620# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 652# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
653# CONFIG_SCSI_HPSA is not set
621# CONFIG_SCSI_3W_9XXX is not set 654# CONFIG_SCSI_3W_9XXX is not set
655# CONFIG_SCSI_3W_SAS is not set
622# CONFIG_SCSI_ACARD is not set 656# CONFIG_SCSI_ACARD is not set
623# CONFIG_SCSI_AACRAID is not set 657# CONFIG_SCSI_AACRAID is not set
624# CONFIG_SCSI_AIC7XXX is not set 658# CONFIG_SCSI_AIC7XXX is not set
@@ -657,6 +691,7 @@ CONFIG_SCSI_LOWLEVEL=y
657# CONFIG_SCSI_NSP32 is not set 691# CONFIG_SCSI_NSP32 is not set
658# CONFIG_SCSI_DEBUG is not set 692# CONFIG_SCSI_DEBUG is not set
659# CONFIG_SCSI_PMCRAID is not set 693# CONFIG_SCSI_PMCRAID is not set
694# CONFIG_SCSI_PM8001 is not set
660# CONFIG_SCSI_SRP is not set 695# CONFIG_SCSI_SRP is not set
661# CONFIG_SCSI_BFA_FC is not set 696# CONFIG_SCSI_BFA_FC is not set
662# CONFIG_SCSI_DH is not set 697# CONFIG_SCSI_DH is not set
@@ -712,15 +747,16 @@ CONFIG_ATA_SFF=y
712# CONFIG_PATA_NS87415 is not set 747# CONFIG_PATA_NS87415 is not set
713# CONFIG_PATA_OPTI is not set 748# CONFIG_PATA_OPTI is not set
714# CONFIG_PATA_OPTIDMA is not set 749# CONFIG_PATA_OPTIDMA is not set
750# CONFIG_PATA_PDC2027X is not set
715# CONFIG_PATA_PDC_OLD is not set 751# CONFIG_PATA_PDC_OLD is not set
716# CONFIG_PATA_RADISYS is not set 752# CONFIG_PATA_RADISYS is not set
717# CONFIG_PATA_RDC is not set 753# CONFIG_PATA_RDC is not set
718# CONFIG_PATA_RZ1000 is not set 754# CONFIG_PATA_RZ1000 is not set
719# CONFIG_PATA_SC1200 is not set 755# CONFIG_PATA_SC1200 is not set
720# CONFIG_PATA_SERVERWORKS is not set 756# CONFIG_PATA_SERVERWORKS is not set
721# CONFIG_PATA_PDC2027X is not set
722# CONFIG_PATA_SIL680 is not set 757# CONFIG_PATA_SIL680 is not set
723# CONFIG_PATA_SIS is not set 758# CONFIG_PATA_SIS is not set
759# CONFIG_PATA_TOSHIBA is not set
724# CONFIG_PATA_VIA is not set 760# CONFIG_PATA_VIA is not set
725# CONFIG_PATA_WINBOND is not set 761# CONFIG_PATA_WINBOND is not set
726# CONFIG_PATA_PLATFORM is not set 762# CONFIG_PATA_PLATFORM is not set
@@ -737,7 +773,7 @@ CONFIG_ATA_SFF=y
737# 773#
738 774
739# 775#
740# See the help texts for more information. 776# The newer stack is recommended.
741# 777#
742# CONFIG_FIREWIRE is not set 778# CONFIG_FIREWIRE is not set
743# CONFIG_IEEE1394 is not set 779# CONFIG_IEEE1394 is not set
@@ -844,8 +880,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
844# CONFIG_BE2NET is not set 880# CONFIG_BE2NET is not set
845# CONFIG_TR is not set 881# CONFIG_TR is not set
846CONFIG_WLAN=y 882CONFIG_WLAN=y
847# CONFIG_WLAN_PRE80211 is not set 883# CONFIG_AIRO is not set
848# CONFIG_WLAN_80211 is not set 884# CONFIG_ATMEL is not set
885# CONFIG_PRISM54 is not set
886# CONFIG_USB_ZD1201 is not set
887# CONFIG_HOSTAP is not set
849 888
850# 889#
851# Enable WiMAX (Networking options) to see the WiMAX drivers 890# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -868,6 +907,7 @@ CONFIG_WLAN=y
868# CONFIG_NETCONSOLE is not set 907# CONFIG_NETCONSOLE is not set
869# CONFIG_NETPOLL is not set 908# CONFIG_NETPOLL is not set
870# CONFIG_NET_POLL_CONTROLLER is not set 909# CONFIG_NET_POLL_CONTROLLER is not set
910# CONFIG_VMXNET3 is not set
871# CONFIG_ISDN is not set 911# CONFIG_ISDN is not set
872# CONFIG_PHONE is not set 912# CONFIG_PHONE is not set
873 913
@@ -877,6 +917,7 @@ CONFIG_WLAN=y
877CONFIG_INPUT=y 917CONFIG_INPUT=y
878CONFIG_INPUT_FF_MEMLESS=m 918CONFIG_INPUT_FF_MEMLESS=m
879# CONFIG_INPUT_POLLDEV is not set 919# CONFIG_INPUT_POLLDEV is not set
920# CONFIG_INPUT_SPARSEKMAP is not set
880 921
881# 922#
882# Userland interfaces 923# Userland interfaces
@@ -929,6 +970,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
929# CONFIG_SERIAL_JSM is not set 970# CONFIG_SERIAL_JSM is not set
930# CONFIG_SERIAL_OF_PLATFORM is not set 971# CONFIG_SERIAL_OF_PLATFORM is not set
931# CONFIG_SERIAL_QE is not set 972# CONFIG_SERIAL_QE is not set
973# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
932CONFIG_UNIX98_PTYS=y 974CONFIG_UNIX98_PTYS=y
933# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 975# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
934CONFIG_LEGACY_PTYS=y 976CONFIG_LEGACY_PTYS=y
@@ -989,11 +1031,6 @@ CONFIG_I2C_MPC=y
989# CONFIG_I2C_TINY_USB is not set 1031# CONFIG_I2C_TINY_USB is not set
990 1032
991# 1033#
992# Graphics adapter I2C/DDC channel drivers
993#
994# CONFIG_I2C_VOODOO3 is not set
995
996#
997# Other I2C/SMBus bus drivers 1034# Other I2C/SMBus bus drivers
998# 1035#
999# CONFIG_I2C_PCA_PLATFORM is not set 1036# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1002,7 +1039,6 @@ CONFIG_I2C_MPC=y
1002# 1039#
1003# Miscellaneous I2C Chip support 1040# Miscellaneous I2C Chip support
1004# 1041#
1005# CONFIG_DS1682 is not set
1006# CONFIG_SENSORS_TSL2550 is not set 1042# CONFIG_SENSORS_TSL2550 is not set
1007# CONFIG_I2C_DEBUG_CORE is not set 1043# CONFIG_I2C_DEBUG_CORE is not set
1008# CONFIG_I2C_DEBUG_ALGO is not set 1044# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1034,6 +1070,7 @@ CONFIG_GPIOLIB=y
1034# 1070#
1035# PCI GPIO expanders: 1071# PCI GPIO expanders:
1036# 1072#
1073# CONFIG_GPIO_CS5535 is not set
1037# CONFIG_GPIO_BT8XX is not set 1074# CONFIG_GPIO_BT8XX is not set
1038# CONFIG_GPIO_LANGWELL is not set 1075# CONFIG_GPIO_LANGWELL is not set
1039 1076
@@ -1076,6 +1113,7 @@ CONFIG_HWMON=y
1076# CONFIG_SENSORS_GL520SM is not set 1113# CONFIG_SENSORS_GL520SM is not set
1077# CONFIG_SENSORS_IT87 is not set 1114# CONFIG_SENSORS_IT87 is not set
1078# CONFIG_SENSORS_LM63 is not set 1115# CONFIG_SENSORS_LM63 is not set
1116# CONFIG_SENSORS_LM73 is not set
1079# CONFIG_SENSORS_LM75 is not set 1117# CONFIG_SENSORS_LM75 is not set
1080# CONFIG_SENSORS_LM77 is not set 1118# CONFIG_SENSORS_LM77 is not set
1081# CONFIG_SENSORS_LM78 is not set 1119# CONFIG_SENSORS_LM78 is not set
@@ -1115,6 +1153,7 @@ CONFIG_HWMON=y
1115# CONFIG_SENSORS_W83L786NG is not set 1153# CONFIG_SENSORS_W83L786NG is not set
1116# CONFIG_SENSORS_W83627HF is not set 1154# CONFIG_SENSORS_W83627HF is not set
1117# CONFIG_SENSORS_W83627EHF is not set 1155# CONFIG_SENSORS_W83627EHF is not set
1156# CONFIG_SENSORS_LIS3_I2C is not set
1118# CONFIG_THERMAL is not set 1157# CONFIG_THERMAL is not set
1119CONFIG_WATCHDOG=y 1158CONFIG_WATCHDOG=y
1120# CONFIG_WATCHDOG_NOWAYOUT is not set 1159# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1153,11 +1192,13 @@ CONFIG_SSB_POSSIBLE=y
1153# CONFIG_TWL4030_CORE is not set 1192# CONFIG_TWL4030_CORE is not set
1154# CONFIG_MFD_TMIO is not set 1193# CONFIG_MFD_TMIO is not set
1155# CONFIG_PMIC_DA903X is not set 1194# CONFIG_PMIC_DA903X is not set
1195# CONFIG_PMIC_ADP5520 is not set
1156# CONFIG_MFD_WM8400 is not set 1196# CONFIG_MFD_WM8400 is not set
1157# CONFIG_MFD_WM831X is not set 1197# CONFIG_MFD_WM831X is not set
1158# CONFIG_MFD_WM8350_I2C is not set 1198# CONFIG_MFD_WM8350_I2C is not set
1159# CONFIG_MFD_PCF50633 is not set 1199# CONFIG_MFD_PCF50633 is not set
1160# CONFIG_AB3100_CORE is not set 1200# CONFIG_AB3100_CORE is not set
1201# CONFIG_MFD_88PM8607 is not set
1161# CONFIG_REGULATOR is not set 1202# CONFIG_REGULATOR is not set
1162# CONFIG_MEDIA_SUPPORT is not set 1203# CONFIG_MEDIA_SUPPORT is not set
1163 1204
@@ -1249,6 +1290,7 @@ CONFIG_USB_MON=y
1249CONFIG_USB_EHCI_HCD=y 1290CONFIG_USB_EHCI_HCD=y
1250CONFIG_USB_EHCI_ROOT_HUB_TT=y 1291CONFIG_USB_EHCI_ROOT_HUB_TT=y
1251# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1292# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1293# CONFIG_XPS_USB_HCD_XILINX is not set
1252CONFIG_USB_EHCI_FSL=y 1294CONFIG_USB_EHCI_FSL=y
1253CONFIG_USB_EHCI_HCD_PPC_OF=y 1295CONFIG_USB_EHCI_HCD_PPC_OF=y
1254# CONFIG_USB_OXU210HP_HCD is not set 1296# CONFIG_USB_OXU210HP_HCD is not set
@@ -1542,7 +1584,7 @@ CONFIG_FRAME_WARN=1024
1542# CONFIG_DEBUG_FS is not set 1584# CONFIG_DEBUG_FS is not set
1543# CONFIG_HEADERS_CHECK is not set 1585# CONFIG_HEADERS_CHECK is not set
1544# CONFIG_DEBUG_KERNEL is not set 1586# CONFIG_DEBUG_KERNEL is not set
1545# CONFIG_DEBUG_BUGVERBOSE is not set 1587CONFIG_DEBUG_BUGVERBOSE=y
1546# CONFIG_DEBUG_MEMORY_INIT is not set 1588# CONFIG_DEBUG_MEMORY_INIT is not set
1547# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1589# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1548# CONFIG_LATENCYTOP is not set 1590# CONFIG_LATENCYTOP is not set
@@ -1569,7 +1611,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1569# CONFIG_KEYS is not set 1611# CONFIG_KEYS is not set
1570# CONFIG_SECURITY is not set 1612# CONFIG_SECURITY is not set
1571# CONFIG_SECURITYFS is not set 1613# CONFIG_SECURITYFS is not set
1572# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1614# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1615# CONFIG_DEFAULT_SECURITY_SMACK is not set
1616# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1617CONFIG_DEFAULT_SECURITY_DAC=y
1618CONFIG_DEFAULT_SECURITY=""
1573CONFIG_CRYPTO=y 1619CONFIG_CRYPTO=y
1574 1620
1575# 1621#
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index a12e7ba87a43..8f35f8049c92 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:25:20 2009 4# Wed Jan 6 09:24:06 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -39,6 +39,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 39# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 40# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
41CONFIG_IRQ_PER_CPU=y 41CONFIG_IRQ_PER_CPU=y
42CONFIG_NR_IRQS=512
42CONFIG_STACKTRACE_SUPPORT=y 43CONFIG_STACKTRACE_SUPPORT=y
43CONFIG_HAVE_LATENCYTOP_SUPPORT=y 44CONFIG_HAVE_LATENCYTOP_SUPPORT=y
44CONFIG_TRACE_IRQFLAGS_SUPPORT=y 45CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -62,6 +63,8 @@ CONFIG_AUDIT_ARCH=y
62CONFIG_GENERIC_BUG=y 63CONFIG_GENERIC_BUG=y
63CONFIG_DTC=y 64CONFIG_DTC=y
64CONFIG_DEFAULT_UIMAGE=y 65CONFIG_DEFAULT_UIMAGE=y
66CONFIG_ARCH_HIBERNATION_POSSIBLE=y
67CONFIG_ARCH_SUSPEND_POSSIBLE=y
65# CONFIG_PPC_DCR_NATIVE is not set 68# CONFIG_PPC_DCR_NATIVE is not set
66# CONFIG_PPC_DCR_MMIO is not set 69# CONFIG_PPC_DCR_MMIO is not set
67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 70CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -92,6 +95,7 @@ CONFIG_AUDIT=y
92# 95#
93CONFIG_TREE_RCU=y 96CONFIG_TREE_RCU=y
94# CONFIG_TREE_PREEMPT_RCU is not set 97# CONFIG_TREE_PREEMPT_RCU is not set
98# CONFIG_TINY_RCU is not set
95# CONFIG_RCU_TRACE is not set 99# CONFIG_RCU_TRACE is not set
96CONFIG_RCU_FANOUT=32 100CONFIG_RCU_FANOUT=32
97# CONFIG_RCU_FANOUT_EXACT is not set 101# CONFIG_RCU_FANOUT_EXACT is not set
@@ -184,14 +188,41 @@ CONFIG_LBDAF=y
184# IO Schedulers 188# IO Schedulers
185# 189#
186CONFIG_IOSCHED_NOOP=y 190CONFIG_IOSCHED_NOOP=y
187CONFIG_IOSCHED_AS=y
188CONFIG_IOSCHED_DEADLINE=y 191CONFIG_IOSCHED_DEADLINE=y
189CONFIG_IOSCHED_CFQ=y 192CONFIG_IOSCHED_CFQ=y
190# CONFIG_DEFAULT_AS is not set
191# CONFIG_DEFAULT_DEADLINE is not set 193# CONFIG_DEFAULT_DEADLINE is not set
192CONFIG_DEFAULT_CFQ=y 194CONFIG_DEFAULT_CFQ=y
193# CONFIG_DEFAULT_NOOP is not set 195# CONFIG_DEFAULT_NOOP is not set
194CONFIG_DEFAULT_IOSCHED="cfq" 196CONFIG_DEFAULT_IOSCHED="cfq"
197# CONFIG_INLINE_SPIN_TRYLOCK is not set
198# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
199# CONFIG_INLINE_SPIN_LOCK is not set
200# CONFIG_INLINE_SPIN_LOCK_BH is not set
201# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
202# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
203CONFIG_INLINE_SPIN_UNLOCK=y
204# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
205CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
206# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
207# CONFIG_INLINE_READ_TRYLOCK is not set
208# CONFIG_INLINE_READ_LOCK is not set
209# CONFIG_INLINE_READ_LOCK_BH is not set
210# CONFIG_INLINE_READ_LOCK_IRQ is not set
211# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
212CONFIG_INLINE_READ_UNLOCK=y
213# CONFIG_INLINE_READ_UNLOCK_BH is not set
214CONFIG_INLINE_READ_UNLOCK_IRQ=y
215# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
216# CONFIG_INLINE_WRITE_TRYLOCK is not set
217# CONFIG_INLINE_WRITE_LOCK is not set
218# CONFIG_INLINE_WRITE_LOCK_BH is not set
219# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
220# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
221CONFIG_INLINE_WRITE_UNLOCK=y
222# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
223CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
224# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
225# CONFIG_MUTEX_SPIN_ON_OWNER is not set
195# CONFIG_FREEZER is not set 226# CONFIG_FREEZER is not set
196CONFIG_PPC_MSI_BITMAP=y 227CONFIG_PPC_MSI_BITMAP=y
197 228
@@ -201,7 +232,7 @@ CONFIG_PPC_MSI_BITMAP=y
201# CONFIG_PPC_CELL is not set 232# CONFIG_PPC_CELL is not set
202# CONFIG_PPC_CELL_NATIVE is not set 233# CONFIG_PPC_CELL_NATIVE is not set
203# CONFIG_PQ2ADS is not set 234# CONFIG_PQ2ADS is not set
204CONFIG_MPC85xx=y 235CONFIG_FSL_SOC_BOOKE=y
205CONFIG_MPC8540_ADS=y 236CONFIG_MPC8540_ADS=y
206CONFIG_MPC8560_ADS=y 237CONFIG_MPC8560_ADS=y
207CONFIG_MPC85xx_CDS=y 238CONFIG_MPC85xx_CDS=y
@@ -220,6 +251,7 @@ CONFIG_TQM8555=y
220CONFIG_TQM8560=y 251CONFIG_TQM8560=y
221CONFIG_SBC8548=y 252CONFIG_SBC8548=y
222# CONFIG_SBC8560 is not set 253# CONFIG_SBC8560 is not set
254# CONFIG_P4080_DS is not set
223CONFIG_TQM85xx=y 255CONFIG_TQM85xx=y
224# CONFIG_IPIC is not set 256# CONFIG_IPIC is not set
225CONFIG_MPIC=y 257CONFIG_MPIC=y
@@ -267,6 +299,7 @@ CONFIG_SWIOTLB=y
267CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 299CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
268CONFIG_ARCH_HAS_WALK_MEMORY=y 300CONFIG_ARCH_HAS_WALK_MEMORY=y
269CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 301CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
302CONFIG_SPARSE_IRQ=y
270CONFIG_MAX_ACTIVE_REGIONS=32 303CONFIG_MAX_ACTIVE_REGIONS=32
271CONFIG_ARCH_FLATMEM_ENABLE=y 304CONFIG_ARCH_FLATMEM_ENABLE=y
272CONFIG_ARCH_POPULATES_NODE_MAP=y 305CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -283,8 +316,6 @@ CONFIG_MIGRATION=y
283CONFIG_ZONE_DMA_FLAG=1 316CONFIG_ZONE_DMA_FLAG=1
284CONFIG_BOUNCE=y 317CONFIG_BOUNCE=y
285CONFIG_VIRT_TO_BUS=y 318CONFIG_VIRT_TO_BUS=y
286CONFIG_HAVE_MLOCK=y
287CONFIG_HAVE_MLOCKED_PAGE_BIT=y
288# CONFIG_KSM is not set 319# CONFIG_KSM is not set
289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 320CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
290CONFIG_PPC_4K_PAGES=y 321CONFIG_PPC_4K_PAGES=y
@@ -405,6 +436,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
405CONFIG_INET6_XFRM_MODE_BEET=y 436CONFIG_INET6_XFRM_MODE_BEET=y
406# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 437# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
407CONFIG_IPV6_SIT=y 438CONFIG_IPV6_SIT=y
439# CONFIG_IPV6_SIT_6RD is not set
408CONFIG_IPV6_NDISC_NODETYPE=y 440CONFIG_IPV6_NDISC_NODETYPE=y
409# CONFIG_IPV6_TUNNEL is not set 441# CONFIG_IPV6_TUNNEL is not set
410# CONFIG_IPV6_MULTIPLE_TABLES is not set 442# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -449,9 +481,6 @@ CONFIG_SCTP_HMAC_MD5=y
449CONFIG_FIB_RULES=y 481CONFIG_FIB_RULES=y
450CONFIG_WIRELESS=y 482CONFIG_WIRELESS=y
451# CONFIG_CFG80211 is not set 483# CONFIG_CFG80211 is not set
452CONFIG_CFG80211_DEFAULT_PS_VALUE=0
453CONFIG_WIRELESS_OLD_REGULATORY=y
454# CONFIG_WIRELESS_EXT is not set
455# CONFIG_LIB80211 is not set 484# CONFIG_LIB80211 is not set
456 485
457# 486#
@@ -494,6 +523,10 @@ CONFIG_BLK_DEV=y
494# CONFIG_BLK_DEV_COW_COMMON is not set 523# CONFIG_BLK_DEV_COW_COMMON is not set
495CONFIG_BLK_DEV_LOOP=y 524CONFIG_BLK_DEV_LOOP=y
496# CONFIG_BLK_DEV_CRYPTOLOOP is not set 525# CONFIG_BLK_DEV_CRYPTOLOOP is not set
526
527#
528# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
529#
497CONFIG_BLK_DEV_NBD=y 530CONFIG_BLK_DEV_NBD=y
498# CONFIG_BLK_DEV_SX8 is not set 531# CONFIG_BLK_DEV_SX8 is not set
499# CONFIG_BLK_DEV_UB is not set 532# CONFIG_BLK_DEV_UB is not set
@@ -505,6 +538,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
505# CONFIG_ATA_OVER_ETH is not set 538# CONFIG_ATA_OVER_ETH is not set
506# CONFIG_BLK_DEV_HD is not set 539# CONFIG_BLK_DEV_HD is not set
507CONFIG_MISC_DEVICES=y 540CONFIG_MISC_DEVICES=y
541# CONFIG_AD525X_DPOT is not set
508# CONFIG_PHANTOM is not set 542# CONFIG_PHANTOM is not set
509# CONFIG_SGI_IOC4 is not set 543# CONFIG_SGI_IOC4 is not set
510# CONFIG_TIFM_CORE is not set 544# CONFIG_TIFM_CORE is not set
@@ -512,6 +546,7 @@ CONFIG_MISC_DEVICES=y
512# CONFIG_ENCLOSURE_SERVICES is not set 546# CONFIG_ENCLOSURE_SERVICES is not set
513# CONFIG_HP_ILO is not set 547# CONFIG_HP_ILO is not set
514# CONFIG_ISL29003 is not set 548# CONFIG_ISL29003 is not set
549# CONFIG_DS1682 is not set
515# CONFIG_C2PORT is not set 550# CONFIG_C2PORT is not set
516 551
517# 552#
@@ -565,7 +600,9 @@ CONFIG_SCSI_LOWLEVEL=y
565# CONFIG_SCSI_BNX2_ISCSI is not set 600# CONFIG_SCSI_BNX2_ISCSI is not set
566# CONFIG_BE2ISCSI is not set 601# CONFIG_BE2ISCSI is not set
567# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 602# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
603# CONFIG_SCSI_HPSA is not set
568# CONFIG_SCSI_3W_9XXX is not set 604# CONFIG_SCSI_3W_9XXX is not set
605# CONFIG_SCSI_3W_SAS is not set
569# CONFIG_SCSI_ACARD is not set 606# CONFIG_SCSI_ACARD is not set
570# CONFIG_SCSI_AACRAID is not set 607# CONFIG_SCSI_AACRAID is not set
571# CONFIG_SCSI_AIC7XXX is not set 608# CONFIG_SCSI_AIC7XXX is not set
@@ -604,6 +641,7 @@ CONFIG_SCSI_LOWLEVEL=y
604# CONFIG_SCSI_NSP32 is not set 641# CONFIG_SCSI_NSP32 is not set
605# CONFIG_SCSI_DEBUG is not set 642# CONFIG_SCSI_DEBUG is not set
606# CONFIG_SCSI_PMCRAID is not set 643# CONFIG_SCSI_PMCRAID is not set
644# CONFIG_SCSI_PM8001 is not set
607# CONFIG_SCSI_SRP is not set 645# CONFIG_SCSI_SRP is not set
608# CONFIG_SCSI_BFA_FC is not set 646# CONFIG_SCSI_BFA_FC is not set
609# CONFIG_SCSI_DH is not set 647# CONFIG_SCSI_DH is not set
@@ -659,15 +697,16 @@ CONFIG_PATA_ALI=y
659# CONFIG_PATA_NS87415 is not set 697# CONFIG_PATA_NS87415 is not set
660# CONFIG_PATA_OPTI is not set 698# CONFIG_PATA_OPTI is not set
661# CONFIG_PATA_OPTIDMA is not set 699# CONFIG_PATA_OPTIDMA is not set
700# CONFIG_PATA_PDC2027X is not set
662# CONFIG_PATA_PDC_OLD is not set 701# CONFIG_PATA_PDC_OLD is not set
663# CONFIG_PATA_RADISYS is not set 702# CONFIG_PATA_RADISYS is not set
664# CONFIG_PATA_RDC is not set 703# CONFIG_PATA_RDC is not set
665# CONFIG_PATA_RZ1000 is not set 704# CONFIG_PATA_RZ1000 is not set
666# CONFIG_PATA_SC1200 is not set 705# CONFIG_PATA_SC1200 is not set
667# CONFIG_PATA_SERVERWORKS is not set 706# CONFIG_PATA_SERVERWORKS is not set
668# CONFIG_PATA_PDC2027X is not set
669# CONFIG_PATA_SIL680 is not set 707# CONFIG_PATA_SIL680 is not set
670# CONFIG_PATA_SIS is not set 708# CONFIG_PATA_SIS is not set
709# CONFIG_PATA_TOSHIBA is not set
671# CONFIG_PATA_VIA is not set 710# CONFIG_PATA_VIA is not set
672# CONFIG_PATA_WINBOND is not set 711# CONFIG_PATA_WINBOND is not set
673# CONFIG_PATA_PLATFORM is not set 712# CONFIG_PATA_PLATFORM is not set
@@ -684,7 +723,7 @@ CONFIG_PATA_ALI=y
684# 723#
685 724
686# 725#
687# See the help texts for more information. 726# The newer stack is recommended.
688# 727#
689# CONFIG_FIREWIRE is not set 728# CONFIG_FIREWIRE is not set
690# CONFIG_IEEE1394 is not set 729# CONFIG_IEEE1394 is not set
@@ -795,8 +834,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
795# CONFIG_BE2NET is not set 834# CONFIG_BE2NET is not set
796# CONFIG_TR is not set 835# CONFIG_TR is not set
797CONFIG_WLAN=y 836CONFIG_WLAN=y
798# CONFIG_WLAN_PRE80211 is not set 837# CONFIG_AIRO is not set
799# CONFIG_WLAN_80211 is not set 838# CONFIG_ATMEL is not set
839# CONFIG_PRISM54 is not set
840# CONFIG_USB_ZD1201 is not set
841# CONFIG_HOSTAP is not set
800 842
801# 843#
802# Enable WiMAX (Networking options) to see the WiMAX drivers 844# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -820,6 +862,7 @@ CONFIG_WLAN=y
820# CONFIG_NETCONSOLE is not set 862# CONFIG_NETCONSOLE is not set
821# CONFIG_NETPOLL is not set 863# CONFIG_NETPOLL is not set
822# CONFIG_NET_POLL_CONTROLLER is not set 864# CONFIG_NET_POLL_CONTROLLER is not set
865# CONFIG_VMXNET3 is not set
823# CONFIG_ISDN is not set 866# CONFIG_ISDN is not set
824# CONFIG_PHONE is not set 867# CONFIG_PHONE is not set
825 868
@@ -829,6 +872,7 @@ CONFIG_WLAN=y
829CONFIG_INPUT=y 872CONFIG_INPUT=y
830CONFIG_INPUT_FF_MEMLESS=m 873CONFIG_INPUT_FF_MEMLESS=m
831# CONFIG_INPUT_POLLDEV is not set 874# CONFIG_INPUT_POLLDEV is not set
875# CONFIG_INPUT_SPARSEKMAP is not set
832 876
833# 877#
834# Userland interfaces 878# Userland interfaces
@@ -858,6 +902,7 @@ CONFIG_SERIO_SERPORT=y
858CONFIG_SERIO_LIBPS2=y 902CONFIG_SERIO_LIBPS2=y
859# CONFIG_SERIO_RAW is not set 903# CONFIG_SERIO_RAW is not set
860# CONFIG_SERIO_XILINX_XPS_PS2 is not set 904# CONFIG_SERIO_XILINX_XPS_PS2 is not set
905# CONFIG_SERIO_ALTERA_PS2 is not set
861# CONFIG_GAMEPORT is not set 906# CONFIG_GAMEPORT is not set
862 907
863# 908#
@@ -896,6 +941,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
896# CONFIG_SERIAL_JSM is not set 941# CONFIG_SERIAL_JSM is not set
897# CONFIG_SERIAL_OF_PLATFORM is not set 942# CONFIG_SERIAL_OF_PLATFORM is not set
898CONFIG_SERIAL_QE=m 943CONFIG_SERIAL_QE=m
944# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
899CONFIG_UNIX98_PTYS=y 945CONFIG_UNIX98_PTYS=y
900# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 946# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
901CONFIG_LEGACY_PTYS=y 947CONFIG_LEGACY_PTYS=y
@@ -956,11 +1002,6 @@ CONFIG_I2C_MPC=y
956# CONFIG_I2C_TINY_USB is not set 1002# CONFIG_I2C_TINY_USB is not set
957 1003
958# 1004#
959# Graphics adapter I2C/DDC channel drivers
960#
961# CONFIG_I2C_VOODOO3 is not set
962
963#
964# Other I2C/SMBus bus drivers 1005# Other I2C/SMBus bus drivers
965# 1006#
966# CONFIG_I2C_PCA_PLATFORM is not set 1007# CONFIG_I2C_PCA_PLATFORM is not set
@@ -969,7 +1010,6 @@ CONFIG_I2C_MPC=y
969# 1010#
970# Miscellaneous I2C Chip support 1011# Miscellaneous I2C Chip support
971# 1012#
972# CONFIG_DS1682 is not set
973# CONFIG_SENSORS_TSL2550 is not set 1013# CONFIG_SENSORS_TSL2550 is not set
974# CONFIG_I2C_DEBUG_CORE is not set 1014# CONFIG_I2C_DEBUG_CORE is not set
975# CONFIG_I2C_DEBUG_ALGO is not set 1015# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1002,6 +1042,7 @@ CONFIG_GPIOLIB=y
1002# 1042#
1003# PCI GPIO expanders: 1043# PCI GPIO expanders:
1004# 1044#
1045# CONFIG_GPIO_CS5535 is not set
1005# CONFIG_GPIO_BT8XX is not set 1046# CONFIG_GPIO_BT8XX is not set
1006# CONFIG_GPIO_LANGWELL is not set 1047# CONFIG_GPIO_LANGWELL is not set
1007 1048
@@ -1035,11 +1076,13 @@ CONFIG_SSB_POSSIBLE=y
1035# CONFIG_TWL4030_CORE is not set 1076# CONFIG_TWL4030_CORE is not set
1036# CONFIG_MFD_TMIO is not set 1077# CONFIG_MFD_TMIO is not set
1037# CONFIG_PMIC_DA903X is not set 1078# CONFIG_PMIC_DA903X is not set
1079# CONFIG_PMIC_ADP5520 is not set
1038# CONFIG_MFD_WM8400 is not set 1080# CONFIG_MFD_WM8400 is not set
1039# CONFIG_MFD_WM831X is not set 1081# CONFIG_MFD_WM831X is not set
1040# CONFIG_MFD_WM8350_I2C is not set 1082# CONFIG_MFD_WM8350_I2C is not set
1041# CONFIG_MFD_PCF50633 is not set 1083# CONFIG_MFD_PCF50633 is not set
1042# CONFIG_AB3100_CORE is not set 1084# CONFIG_AB3100_CORE is not set
1085# CONFIG_MFD_88PM8607 is not set
1043# CONFIG_REGULATOR is not set 1086# CONFIG_REGULATOR is not set
1044# CONFIG_MEDIA_SUPPORT is not set 1087# CONFIG_MEDIA_SUPPORT is not set
1045 1088
@@ -1114,6 +1157,7 @@ CONFIG_SND_PCI=y
1114# CONFIG_SND_CS4281 is not set 1157# CONFIG_SND_CS4281 is not set
1115# CONFIG_SND_CS46XX is not set 1158# CONFIG_SND_CS46XX is not set
1116# CONFIG_SND_CS5530 is not set 1159# CONFIG_SND_CS5530 is not set
1160# CONFIG_SND_CS5535AUDIO is not set
1117# CONFIG_SND_CTXFI is not set 1161# CONFIG_SND_CTXFI is not set
1118# CONFIG_SND_DARLA20 is not set 1162# CONFIG_SND_DARLA20 is not set
1119# CONFIG_SND_GINA20 is not set 1163# CONFIG_SND_GINA20 is not set
@@ -1241,6 +1285,7 @@ CONFIG_USB_MON=y
1241CONFIG_USB_EHCI_HCD=y 1285CONFIG_USB_EHCI_HCD=y
1242CONFIG_USB_EHCI_ROOT_HUB_TT=y 1286CONFIG_USB_EHCI_ROOT_HUB_TT=y
1243# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1287# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1288# CONFIG_XPS_USB_HCD_XILINX is not set
1244CONFIG_USB_EHCI_FSL=y 1289CONFIG_USB_EHCI_FSL=y
1245CONFIG_USB_EHCI_HCD_PPC_OF=y 1290CONFIG_USB_EHCI_HCD_PPC_OF=y
1246# CONFIG_USB_OXU210HP_HCD is not set 1291# CONFIG_USB_OXU210HP_HCD is not set
@@ -1347,7 +1392,6 @@ CONFIG_EDAC=y
1347# 1392#
1348# CONFIG_EDAC_DEBUG is not set 1393# CONFIG_EDAC_DEBUG is not set
1349CONFIG_EDAC_MM_EDAC=y 1394CONFIG_EDAC_MM_EDAC=y
1350CONFIG_EDAC_MPC85XX=y
1351CONFIG_RTC_LIB=y 1395CONFIG_RTC_LIB=y
1352CONFIG_RTC_CLASS=y 1396CONFIG_RTC_CLASS=y
1353CONFIG_RTC_HCTOSYS=y 1397CONFIG_RTC_HCTOSYS=y
@@ -1376,6 +1420,7 @@ CONFIG_RTC_INTF_DEV=y
1376# CONFIG_RTC_DRV_PCF8563 is not set 1420# CONFIG_RTC_DRV_PCF8563 is not set
1377# CONFIG_RTC_DRV_PCF8583 is not set 1421# CONFIG_RTC_DRV_PCF8583 is not set
1378# CONFIG_RTC_DRV_M41T80 is not set 1422# CONFIG_RTC_DRV_M41T80 is not set
1423# CONFIG_RTC_DRV_BQ32K is not set
1379# CONFIG_RTC_DRV_S35390A is not set 1424# CONFIG_RTC_DRV_S35390A is not set
1380# CONFIG_RTC_DRV_FM3130 is not set 1425# CONFIG_RTC_DRV_FM3130 is not set
1381# CONFIG_RTC_DRV_RX8581 is not set 1426# CONFIG_RTC_DRV_RX8581 is not set
@@ -1397,7 +1442,9 @@ CONFIG_RTC_DRV_CMOS=y
1397# CONFIG_RTC_DRV_M48T86 is not set 1442# CONFIG_RTC_DRV_M48T86 is not set
1398# CONFIG_RTC_DRV_M48T35 is not set 1443# CONFIG_RTC_DRV_M48T35 is not set
1399# CONFIG_RTC_DRV_M48T59 is not set 1444# CONFIG_RTC_DRV_M48T59 is not set
1445# CONFIG_RTC_DRV_MSM6242 is not set
1400# CONFIG_RTC_DRV_BQ4802 is not set 1446# CONFIG_RTC_DRV_BQ4802 is not set
1447# CONFIG_RTC_DRV_RP5C01 is not set
1401# CONFIG_RTC_DRV_V3020 is not set 1448# CONFIG_RTC_DRV_V3020 is not set
1402 1449
1403# 1450#
@@ -1731,7 +1778,11 @@ CONFIG_VIRQ_DEBUG=y
1731# CONFIG_KEYS is not set 1778# CONFIG_KEYS is not set
1732# CONFIG_SECURITY is not set 1779# CONFIG_SECURITY is not set
1733# CONFIG_SECURITYFS is not set 1780# CONFIG_SECURITYFS is not set
1734# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1781# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1782# CONFIG_DEFAULT_SECURITY_SMACK is not set
1783# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1784CONFIG_DEFAULT_SECURITY_DAC=y
1785CONFIG_DEFAULT_SECURITY=""
1735CONFIG_CRYPTO=y 1786CONFIG_CRYPTO=y
1736 1787
1737# 1788#
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index cd70b4a4ce01..8755ea3c7f5f 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:26:01 2009 4# Wed Jan 6 09:24:07 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -16,9 +16,9 @@ CONFIG_PPC_85xx=y
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_E500=y 17CONFIG_E500=y
18# CONFIG_PPC_E500MC is not set 18# CONFIG_PPC_E500MC is not set
19CONFIG_FSL_EMB_PERFMON=y
19CONFIG_BOOKE=y 20CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 21CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y 24CONFIG_PPC_MMU_NOHASH=y
@@ -40,6 +40,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 40# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 41# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
42CONFIG_IRQ_PER_CPU=y 42CONFIG_IRQ_PER_CPU=y
43CONFIG_NR_IRQS=512
43CONFIG_STACKTRACE_SUPPORT=y 44CONFIG_STACKTRACE_SUPPORT=y
44CONFIG_HAVE_LATENCYTOP_SUPPORT=y 45CONFIG_HAVE_LATENCYTOP_SUPPORT=y
45CONFIG_TRACE_IRQFLAGS_SUPPORT=y 46CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -63,6 +64,8 @@ CONFIG_AUDIT_ARCH=y
63CONFIG_GENERIC_BUG=y 64CONFIG_GENERIC_BUG=y
64CONFIG_DTC=y 65CONFIG_DTC=y
65CONFIG_DEFAULT_UIMAGE=y 66CONFIG_DEFAULT_UIMAGE=y
67CONFIG_ARCH_HIBERNATION_POSSIBLE=y
68CONFIG_ARCH_SUSPEND_POSSIBLE=y
66# CONFIG_PPC_DCR_NATIVE is not set 69# CONFIG_PPC_DCR_NATIVE is not set
67# CONFIG_PPC_DCR_MMIO is not set 70# CONFIG_PPC_DCR_MMIO is not set
68CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 71CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -93,6 +96,7 @@ CONFIG_AUDIT=y
93# 96#
94CONFIG_TREE_RCU=y 97CONFIG_TREE_RCU=y
95# CONFIG_TREE_PREEMPT_RCU is not set 98# CONFIG_TREE_PREEMPT_RCU is not set
99# CONFIG_TINY_RCU is not set
96# CONFIG_RCU_TRACE is not set 100# CONFIG_RCU_TRACE is not set
97CONFIG_RCU_FANOUT=32 101CONFIG_RCU_FANOUT=32
98# CONFIG_RCU_FANOUT_EXACT is not set 102# CONFIG_RCU_FANOUT_EXACT is not set
@@ -187,14 +191,41 @@ CONFIG_LBDAF=y
187# IO Schedulers 191# IO Schedulers
188# 192#
189CONFIG_IOSCHED_NOOP=y 193CONFIG_IOSCHED_NOOP=y
190CONFIG_IOSCHED_AS=y
191CONFIG_IOSCHED_DEADLINE=y 194CONFIG_IOSCHED_DEADLINE=y
192CONFIG_IOSCHED_CFQ=y 195CONFIG_IOSCHED_CFQ=y
193# CONFIG_DEFAULT_AS is not set
194# CONFIG_DEFAULT_DEADLINE is not set 196# CONFIG_DEFAULT_DEADLINE is not set
195CONFIG_DEFAULT_CFQ=y 197CONFIG_DEFAULT_CFQ=y
196# CONFIG_DEFAULT_NOOP is not set 198# CONFIG_DEFAULT_NOOP is not set
197CONFIG_DEFAULT_IOSCHED="cfq" 199CONFIG_DEFAULT_IOSCHED="cfq"
200# CONFIG_INLINE_SPIN_TRYLOCK is not set
201# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
202# CONFIG_INLINE_SPIN_LOCK is not set
203# CONFIG_INLINE_SPIN_LOCK_BH is not set
204# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
205# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
206CONFIG_INLINE_SPIN_UNLOCK=y
207# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
208CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
209# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
210# CONFIG_INLINE_READ_TRYLOCK is not set
211# CONFIG_INLINE_READ_LOCK is not set
212# CONFIG_INLINE_READ_LOCK_BH is not set
213# CONFIG_INLINE_READ_LOCK_IRQ is not set
214# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
215CONFIG_INLINE_READ_UNLOCK=y
216# CONFIG_INLINE_READ_UNLOCK_BH is not set
217CONFIG_INLINE_READ_UNLOCK_IRQ=y
218# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
219# CONFIG_INLINE_WRITE_TRYLOCK is not set
220# CONFIG_INLINE_WRITE_LOCK is not set
221# CONFIG_INLINE_WRITE_LOCK_BH is not set
222# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
223# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
224CONFIG_INLINE_WRITE_UNLOCK=y
225# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
226CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
227# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
228CONFIG_MUTEX_SPIN_ON_OWNER=y
198# CONFIG_FREEZER is not set 229# CONFIG_FREEZER is not set
199CONFIG_PPC_MSI_BITMAP=y 230CONFIG_PPC_MSI_BITMAP=y
200 231
@@ -204,7 +235,7 @@ CONFIG_PPC_MSI_BITMAP=y
204# CONFIG_PPC_CELL is not set 235# CONFIG_PPC_CELL is not set
205# CONFIG_PPC_CELL_NATIVE is not set 236# CONFIG_PPC_CELL_NATIVE is not set
206# CONFIG_PQ2ADS is not set 237# CONFIG_PQ2ADS is not set
207CONFIG_MPC85xx=y 238CONFIG_FSL_SOC_BOOKE=y
208CONFIG_MPC8540_ADS=y 239CONFIG_MPC8540_ADS=y
209CONFIG_MPC8560_ADS=y 240CONFIG_MPC8560_ADS=y
210CONFIG_MPC85xx_CDS=y 241CONFIG_MPC85xx_CDS=y
@@ -223,6 +254,7 @@ CONFIG_TQM8555=y
223CONFIG_TQM8560=y 254CONFIG_TQM8560=y
224CONFIG_SBC8548=y 255CONFIG_SBC8548=y
225# CONFIG_SBC8560 is not set 256# CONFIG_SBC8560 is not set
257# CONFIG_P4080_DS is not set
226CONFIG_TQM85xx=y 258CONFIG_TQM85xx=y
227# CONFIG_IPIC is not set 259# CONFIG_IPIC is not set
228CONFIG_MPIC=y 260CONFIG_MPIC=y
@@ -271,6 +303,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
271CONFIG_ARCH_HAS_WALK_MEMORY=y 303CONFIG_ARCH_HAS_WALK_MEMORY=y
272CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 304CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
273# CONFIG_IRQ_ALL_CPUS is not set 305# CONFIG_IRQ_ALL_CPUS is not set
306CONFIG_SPARSE_IRQ=y
274CONFIG_MAX_ACTIVE_REGIONS=32 307CONFIG_MAX_ACTIVE_REGIONS=32
275CONFIG_ARCH_FLATMEM_ENABLE=y 308CONFIG_ARCH_FLATMEM_ENABLE=y
276CONFIG_ARCH_POPULATES_NODE_MAP=y 309CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -287,8 +320,6 @@ CONFIG_MIGRATION=y
287CONFIG_ZONE_DMA_FLAG=1 320CONFIG_ZONE_DMA_FLAG=1
288CONFIG_BOUNCE=y 321CONFIG_BOUNCE=y
289CONFIG_VIRT_TO_BUS=y 322CONFIG_VIRT_TO_BUS=y
290CONFIG_HAVE_MLOCK=y
291CONFIG_HAVE_MLOCKED_PAGE_BIT=y
292# CONFIG_KSM is not set 323# CONFIG_KSM is not set
293CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 324CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
294CONFIG_PPC_4K_PAGES=y 325CONFIG_PPC_4K_PAGES=y
@@ -409,6 +440,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
409CONFIG_INET6_XFRM_MODE_BEET=y 440CONFIG_INET6_XFRM_MODE_BEET=y
410# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 441# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
411CONFIG_IPV6_SIT=y 442CONFIG_IPV6_SIT=y
443# CONFIG_IPV6_SIT_6RD is not set
412CONFIG_IPV6_NDISC_NODETYPE=y 444CONFIG_IPV6_NDISC_NODETYPE=y
413# CONFIG_IPV6_TUNNEL is not set 445# CONFIG_IPV6_TUNNEL is not set
414# CONFIG_IPV6_MULTIPLE_TABLES is not set 446# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -453,9 +485,6 @@ CONFIG_SCTP_HMAC_MD5=y
453CONFIG_FIB_RULES=y 485CONFIG_FIB_RULES=y
454CONFIG_WIRELESS=y 486CONFIG_WIRELESS=y
455# CONFIG_CFG80211 is not set 487# CONFIG_CFG80211 is not set
456CONFIG_CFG80211_DEFAULT_PS_VALUE=0
457CONFIG_WIRELESS_OLD_REGULATORY=y
458# CONFIG_WIRELESS_EXT is not set
459# CONFIG_LIB80211 is not set 488# CONFIG_LIB80211 is not set
460 489
461# 490#
@@ -498,6 +527,10 @@ CONFIG_BLK_DEV=y
498# CONFIG_BLK_DEV_COW_COMMON is not set 527# CONFIG_BLK_DEV_COW_COMMON is not set
499CONFIG_BLK_DEV_LOOP=y 528CONFIG_BLK_DEV_LOOP=y
500# CONFIG_BLK_DEV_CRYPTOLOOP is not set 529# CONFIG_BLK_DEV_CRYPTOLOOP is not set
530
531#
532# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
533#
501CONFIG_BLK_DEV_NBD=y 534CONFIG_BLK_DEV_NBD=y
502# CONFIG_BLK_DEV_SX8 is not set 535# CONFIG_BLK_DEV_SX8 is not set
503# CONFIG_BLK_DEV_UB is not set 536# CONFIG_BLK_DEV_UB is not set
@@ -509,6 +542,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
509# CONFIG_ATA_OVER_ETH is not set 542# CONFIG_ATA_OVER_ETH is not set
510# CONFIG_BLK_DEV_HD is not set 543# CONFIG_BLK_DEV_HD is not set
511CONFIG_MISC_DEVICES=y 544CONFIG_MISC_DEVICES=y
545# CONFIG_AD525X_DPOT is not set
512# CONFIG_PHANTOM is not set 546# CONFIG_PHANTOM is not set
513# CONFIG_SGI_IOC4 is not set 547# CONFIG_SGI_IOC4 is not set
514# CONFIG_TIFM_CORE is not set 548# CONFIG_TIFM_CORE is not set
@@ -516,6 +550,7 @@ CONFIG_MISC_DEVICES=y
516# CONFIG_ENCLOSURE_SERVICES is not set 550# CONFIG_ENCLOSURE_SERVICES is not set
517# CONFIG_HP_ILO is not set 551# CONFIG_HP_ILO is not set
518# CONFIG_ISL29003 is not set 552# CONFIG_ISL29003 is not set
553# CONFIG_DS1682 is not set
519# CONFIG_C2PORT is not set 554# CONFIG_C2PORT is not set
520 555
521# 556#
@@ -569,7 +604,9 @@ CONFIG_SCSI_LOWLEVEL=y
569# CONFIG_SCSI_BNX2_ISCSI is not set 604# CONFIG_SCSI_BNX2_ISCSI is not set
570# CONFIG_BE2ISCSI is not set 605# CONFIG_BE2ISCSI is not set
571# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 606# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
607# CONFIG_SCSI_HPSA is not set
572# CONFIG_SCSI_3W_9XXX is not set 608# CONFIG_SCSI_3W_9XXX is not set
609# CONFIG_SCSI_3W_SAS is not set
573# CONFIG_SCSI_ACARD is not set 610# CONFIG_SCSI_ACARD is not set
574# CONFIG_SCSI_AACRAID is not set 611# CONFIG_SCSI_AACRAID is not set
575# CONFIG_SCSI_AIC7XXX is not set 612# CONFIG_SCSI_AIC7XXX is not set
@@ -608,6 +645,7 @@ CONFIG_SCSI_LOWLEVEL=y
608# CONFIG_SCSI_NSP32 is not set 645# CONFIG_SCSI_NSP32 is not set
609# CONFIG_SCSI_DEBUG is not set 646# CONFIG_SCSI_DEBUG is not set
610# CONFIG_SCSI_PMCRAID is not set 647# CONFIG_SCSI_PMCRAID is not set
648# CONFIG_SCSI_PM8001 is not set
611# CONFIG_SCSI_SRP is not set 649# CONFIG_SCSI_SRP is not set
612# CONFIG_SCSI_BFA_FC is not set 650# CONFIG_SCSI_BFA_FC is not set
613# CONFIG_SCSI_DH is not set 651# CONFIG_SCSI_DH is not set
@@ -663,15 +701,16 @@ CONFIG_PATA_ALI=y
663# CONFIG_PATA_NS87415 is not set 701# CONFIG_PATA_NS87415 is not set
664# CONFIG_PATA_OPTI is not set 702# CONFIG_PATA_OPTI is not set
665# CONFIG_PATA_OPTIDMA is not set 703# CONFIG_PATA_OPTIDMA is not set
704# CONFIG_PATA_PDC2027X is not set
666# CONFIG_PATA_PDC_OLD is not set 705# CONFIG_PATA_PDC_OLD is not set
667# CONFIG_PATA_RADISYS is not set 706# CONFIG_PATA_RADISYS is not set
668# CONFIG_PATA_RDC is not set 707# CONFIG_PATA_RDC is not set
669# CONFIG_PATA_RZ1000 is not set 708# CONFIG_PATA_RZ1000 is not set
670# CONFIG_PATA_SC1200 is not set 709# CONFIG_PATA_SC1200 is not set
671# CONFIG_PATA_SERVERWORKS is not set 710# CONFIG_PATA_SERVERWORKS is not set
672# CONFIG_PATA_PDC2027X is not set
673# CONFIG_PATA_SIL680 is not set 711# CONFIG_PATA_SIL680 is not set
674# CONFIG_PATA_SIS is not set 712# CONFIG_PATA_SIS is not set
713# CONFIG_PATA_TOSHIBA is not set
675# CONFIG_PATA_VIA is not set 714# CONFIG_PATA_VIA is not set
676# CONFIG_PATA_WINBOND is not set 715# CONFIG_PATA_WINBOND is not set
677# CONFIG_PATA_PLATFORM is not set 716# CONFIG_PATA_PLATFORM is not set
@@ -688,7 +727,7 @@ CONFIG_PATA_ALI=y
688# 727#
689 728
690# 729#
691# See the help texts for more information. 730# The newer stack is recommended.
692# 731#
693# CONFIG_FIREWIRE is not set 732# CONFIG_FIREWIRE is not set
694# CONFIG_IEEE1394 is not set 733# CONFIG_IEEE1394 is not set
@@ -799,8 +838,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
799# CONFIG_BE2NET is not set 838# CONFIG_BE2NET is not set
800# CONFIG_TR is not set 839# CONFIG_TR is not set
801CONFIG_WLAN=y 840CONFIG_WLAN=y
802# CONFIG_WLAN_PRE80211 is not set 841# CONFIG_AIRO is not set
803# CONFIG_WLAN_80211 is not set 842# CONFIG_ATMEL is not set
843# CONFIG_PRISM54 is not set
844# CONFIG_USB_ZD1201 is not set
845# CONFIG_HOSTAP is not set
804 846
805# 847#
806# Enable WiMAX (Networking options) to see the WiMAX drivers 848# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -824,6 +866,7 @@ CONFIG_WLAN=y
824# CONFIG_NETCONSOLE is not set 866# CONFIG_NETCONSOLE is not set
825# CONFIG_NETPOLL is not set 867# CONFIG_NETPOLL is not set
826# CONFIG_NET_POLL_CONTROLLER is not set 868# CONFIG_NET_POLL_CONTROLLER is not set
869# CONFIG_VMXNET3 is not set
827# CONFIG_ISDN is not set 870# CONFIG_ISDN is not set
828# CONFIG_PHONE is not set 871# CONFIG_PHONE is not set
829 872
@@ -833,6 +876,7 @@ CONFIG_WLAN=y
833CONFIG_INPUT=y 876CONFIG_INPUT=y
834CONFIG_INPUT_FF_MEMLESS=m 877CONFIG_INPUT_FF_MEMLESS=m
835# CONFIG_INPUT_POLLDEV is not set 878# CONFIG_INPUT_POLLDEV is not set
879# CONFIG_INPUT_SPARSEKMAP is not set
836 880
837# 881#
838# Userland interfaces 882# Userland interfaces
@@ -862,6 +906,7 @@ CONFIG_SERIO_SERPORT=y
862CONFIG_SERIO_LIBPS2=y 906CONFIG_SERIO_LIBPS2=y
863# CONFIG_SERIO_RAW is not set 907# CONFIG_SERIO_RAW is not set
864# CONFIG_SERIO_XILINX_XPS_PS2 is not set 908# CONFIG_SERIO_XILINX_XPS_PS2 is not set
909# CONFIG_SERIO_ALTERA_PS2 is not set
865# CONFIG_GAMEPORT is not set 910# CONFIG_GAMEPORT is not set
866 911
867# 912#
@@ -900,6 +945,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
900# CONFIG_SERIAL_JSM is not set 945# CONFIG_SERIAL_JSM is not set
901# CONFIG_SERIAL_OF_PLATFORM is not set 946# CONFIG_SERIAL_OF_PLATFORM is not set
902CONFIG_SERIAL_QE=m 947CONFIG_SERIAL_QE=m
948# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
903CONFIG_UNIX98_PTYS=y 949CONFIG_UNIX98_PTYS=y
904# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 950# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
905CONFIG_LEGACY_PTYS=y 951CONFIG_LEGACY_PTYS=y
@@ -960,11 +1006,6 @@ CONFIG_I2C_MPC=y
960# CONFIG_I2C_TINY_USB is not set 1006# CONFIG_I2C_TINY_USB is not set
961 1007
962# 1008#
963# Graphics adapter I2C/DDC channel drivers
964#
965# CONFIG_I2C_VOODOO3 is not set
966
967#
968# Other I2C/SMBus bus drivers 1009# Other I2C/SMBus bus drivers
969# 1010#
970# CONFIG_I2C_PCA_PLATFORM is not set 1011# CONFIG_I2C_PCA_PLATFORM is not set
@@ -973,7 +1014,6 @@ CONFIG_I2C_MPC=y
973# 1014#
974# Miscellaneous I2C Chip support 1015# Miscellaneous I2C Chip support
975# 1016#
976# CONFIG_DS1682 is not set
977# CONFIG_SENSORS_TSL2550 is not set 1017# CONFIG_SENSORS_TSL2550 is not set
978# CONFIG_I2C_DEBUG_CORE is not set 1018# CONFIG_I2C_DEBUG_CORE is not set
979# CONFIG_I2C_DEBUG_ALGO is not set 1019# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1006,6 +1046,7 @@ CONFIG_GPIOLIB=y
1006# 1046#
1007# PCI GPIO expanders: 1047# PCI GPIO expanders:
1008# 1048#
1049# CONFIG_GPIO_CS5535 is not set
1009# CONFIG_GPIO_BT8XX is not set 1050# CONFIG_GPIO_BT8XX is not set
1010# CONFIG_GPIO_LANGWELL is not set 1051# CONFIG_GPIO_LANGWELL is not set
1011 1052
@@ -1039,11 +1080,13 @@ CONFIG_SSB_POSSIBLE=y
1039# CONFIG_TWL4030_CORE is not set 1080# CONFIG_TWL4030_CORE is not set
1040# CONFIG_MFD_TMIO is not set 1081# CONFIG_MFD_TMIO is not set
1041# CONFIG_PMIC_DA903X is not set 1082# CONFIG_PMIC_DA903X is not set
1083# CONFIG_PMIC_ADP5520 is not set
1042# CONFIG_MFD_WM8400 is not set 1084# CONFIG_MFD_WM8400 is not set
1043# CONFIG_MFD_WM831X is not set 1085# CONFIG_MFD_WM831X is not set
1044# CONFIG_MFD_WM8350_I2C is not set 1086# CONFIG_MFD_WM8350_I2C is not set
1045# CONFIG_MFD_PCF50633 is not set 1087# CONFIG_MFD_PCF50633 is not set
1046# CONFIG_AB3100_CORE is not set 1088# CONFIG_AB3100_CORE is not set
1089# CONFIG_MFD_88PM8607 is not set
1047# CONFIG_REGULATOR is not set 1090# CONFIG_REGULATOR is not set
1048# CONFIG_MEDIA_SUPPORT is not set 1091# CONFIG_MEDIA_SUPPORT is not set
1049 1092
@@ -1118,6 +1161,7 @@ CONFIG_SND_PCI=y
1118# CONFIG_SND_CS4281 is not set 1161# CONFIG_SND_CS4281 is not set
1119# CONFIG_SND_CS46XX is not set 1162# CONFIG_SND_CS46XX is not set
1120# CONFIG_SND_CS5530 is not set 1163# CONFIG_SND_CS5530 is not set
1164# CONFIG_SND_CS5535AUDIO is not set
1121# CONFIG_SND_CTXFI is not set 1165# CONFIG_SND_CTXFI is not set
1122# CONFIG_SND_DARLA20 is not set 1166# CONFIG_SND_DARLA20 is not set
1123# CONFIG_SND_GINA20 is not set 1167# CONFIG_SND_GINA20 is not set
@@ -1245,6 +1289,7 @@ CONFIG_USB_MON=y
1245CONFIG_USB_EHCI_HCD=y 1289CONFIG_USB_EHCI_HCD=y
1246CONFIG_USB_EHCI_ROOT_HUB_TT=y 1290CONFIG_USB_EHCI_ROOT_HUB_TT=y
1247# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1291# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1292# CONFIG_XPS_USB_HCD_XILINX is not set
1248CONFIG_USB_EHCI_FSL=y 1293CONFIG_USB_EHCI_FSL=y
1249CONFIG_USB_EHCI_HCD_PPC_OF=y 1294CONFIG_USB_EHCI_HCD_PPC_OF=y
1250# CONFIG_USB_OXU210HP_HCD is not set 1295# CONFIG_USB_OXU210HP_HCD is not set
@@ -1351,7 +1396,6 @@ CONFIG_EDAC=y
1351# 1396#
1352# CONFIG_EDAC_DEBUG is not set 1397# CONFIG_EDAC_DEBUG is not set
1353CONFIG_EDAC_MM_EDAC=y 1398CONFIG_EDAC_MM_EDAC=y
1354CONFIG_EDAC_MPC85XX=y
1355CONFIG_RTC_LIB=y 1399CONFIG_RTC_LIB=y
1356CONFIG_RTC_CLASS=y 1400CONFIG_RTC_CLASS=y
1357CONFIG_RTC_HCTOSYS=y 1401CONFIG_RTC_HCTOSYS=y
@@ -1380,6 +1424,7 @@ CONFIG_RTC_INTF_DEV=y
1380# CONFIG_RTC_DRV_PCF8563 is not set 1424# CONFIG_RTC_DRV_PCF8563 is not set
1381# CONFIG_RTC_DRV_PCF8583 is not set 1425# CONFIG_RTC_DRV_PCF8583 is not set
1382# CONFIG_RTC_DRV_M41T80 is not set 1426# CONFIG_RTC_DRV_M41T80 is not set
1427# CONFIG_RTC_DRV_BQ32K is not set
1383# CONFIG_RTC_DRV_S35390A is not set 1428# CONFIG_RTC_DRV_S35390A is not set
1384# CONFIG_RTC_DRV_FM3130 is not set 1429# CONFIG_RTC_DRV_FM3130 is not set
1385# CONFIG_RTC_DRV_RX8581 is not set 1430# CONFIG_RTC_DRV_RX8581 is not set
@@ -1401,7 +1446,9 @@ CONFIG_RTC_DRV_CMOS=y
1401# CONFIG_RTC_DRV_M48T86 is not set 1446# CONFIG_RTC_DRV_M48T86 is not set
1402# CONFIG_RTC_DRV_M48T35 is not set 1447# CONFIG_RTC_DRV_M48T35 is not set
1403# CONFIG_RTC_DRV_M48T59 is not set 1448# CONFIG_RTC_DRV_M48T59 is not set
1449# CONFIG_RTC_DRV_MSM6242 is not set
1404# CONFIG_RTC_DRV_BQ4802 is not set 1450# CONFIG_RTC_DRV_BQ4802 is not set
1451# CONFIG_RTC_DRV_RP5C01 is not set
1405# CONFIG_RTC_DRV_V3020 is not set 1452# CONFIG_RTC_DRV_V3020 is not set
1406 1453
1407# 1454#
@@ -1735,7 +1782,11 @@ CONFIG_VIRQ_DEBUG=y
1735# CONFIG_KEYS is not set 1782# CONFIG_KEYS is not set
1736# CONFIG_SECURITY is not set 1783# CONFIG_SECURITY is not set
1737# CONFIG_SECURITYFS is not set 1784# CONFIG_SECURITYFS is not set
1738# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1785# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1786# CONFIG_DEFAULT_SECURITY_SMACK is not set
1787# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1788CONFIG_DEFAULT_SECURITY_DAC=y
1789CONFIG_DEFAULT_SECURITY=""
1739CONFIG_CRYPTO=y 1790CONFIG_CRYPTO=y
1740 1791
1741# 1792#
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 40d6f0568ca5..3f6b11b6f4f3 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:15 2009 4# Wed Jan 6 09:24:08 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -53,6 +54,7 @@ CONFIG_OF=y
53CONFIG_AUDIT_ARCH=y 54CONFIG_AUDIT_ARCH=y
54CONFIG_DTC=y 55CONFIG_DTC=y
55# CONFIG_DEFAULT_UIMAGE is not set 56# CONFIG_DEFAULT_UIMAGE is not set
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
56# CONFIG_PPC_DCR_NATIVE is not set 58# CONFIG_PPC_DCR_NATIVE is not set
57# CONFIG_PPC_DCR_MMIO is not set 59# CONFIG_PPC_DCR_MMIO is not set
58CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 60CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -80,6 +82,7 @@ CONFIG_SYSVIPC_SYSCTL=y
80# 82#
81CONFIG_TREE_RCU=y 83CONFIG_TREE_RCU=y
82# CONFIG_TREE_PREEMPT_RCU is not set 84# CONFIG_TREE_PREEMPT_RCU is not set
85# CONFIG_TINY_RCU is not set
83# CONFIG_RCU_TRACE is not set 86# CONFIG_RCU_TRACE is not set
84CONFIG_RCU_FANOUT=32 87CONFIG_RCU_FANOUT=32
85# CONFIG_RCU_FANOUT_EXACT is not set 88# CONFIG_RCU_FANOUT_EXACT is not set
@@ -158,14 +161,41 @@ CONFIG_LBDAF=y
158# IO Schedulers 161# IO Schedulers
159# 162#
160CONFIG_IOSCHED_NOOP=y 163CONFIG_IOSCHED_NOOP=y
161CONFIG_IOSCHED_AS=y
162CONFIG_IOSCHED_DEADLINE=y 164CONFIG_IOSCHED_DEADLINE=y
163CONFIG_IOSCHED_CFQ=y 165CONFIG_IOSCHED_CFQ=y
164CONFIG_DEFAULT_AS=y
165# CONFIG_DEFAULT_DEADLINE is not set 166# CONFIG_DEFAULT_DEADLINE is not set
166# CONFIG_DEFAULT_CFQ is not set 167CONFIG_DEFAULT_CFQ=y
167# CONFIG_DEFAULT_NOOP is not set 168# CONFIG_DEFAULT_NOOP is not set
168CONFIG_DEFAULT_IOSCHED="anticipatory" 169CONFIG_DEFAULT_IOSCHED="cfq"
170# CONFIG_INLINE_SPIN_TRYLOCK is not set
171# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
172# CONFIG_INLINE_SPIN_LOCK is not set
173# CONFIG_INLINE_SPIN_LOCK_BH is not set
174# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
175# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
176CONFIG_INLINE_SPIN_UNLOCK=y
177# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
178CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
179# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
180# CONFIG_INLINE_READ_TRYLOCK is not set
181# CONFIG_INLINE_READ_LOCK is not set
182# CONFIG_INLINE_READ_LOCK_BH is not set
183# CONFIG_INLINE_READ_LOCK_IRQ is not set
184# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
185CONFIG_INLINE_READ_UNLOCK=y
186# CONFIG_INLINE_READ_UNLOCK_BH is not set
187CONFIG_INLINE_READ_UNLOCK_IRQ=y
188# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
189# CONFIG_INLINE_WRITE_TRYLOCK is not set
190# CONFIG_INLINE_WRITE_LOCK is not set
191# CONFIG_INLINE_WRITE_LOCK_BH is not set
192# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
193# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
194CONFIG_INLINE_WRITE_UNLOCK=y
195# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
196CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
197# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
198# CONFIG_MUTEX_SPIN_ON_OWNER is not set
169# CONFIG_FREEZER is not set 199# CONFIG_FREEZER is not set
170 200
171# 201#
@@ -240,6 +270,7 @@ CONFIG_MATH_EMULATION=y
240CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 270CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
241CONFIG_ARCH_HAS_WALK_MEMORY=y 271CONFIG_ARCH_HAS_WALK_MEMORY=y
242CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 272CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
273CONFIG_SPARSE_IRQ=y
243CONFIG_MAX_ACTIVE_REGIONS=32 274CONFIG_MAX_ACTIVE_REGIONS=32
244CONFIG_ARCH_FLATMEM_ENABLE=y 275CONFIG_ARCH_FLATMEM_ENABLE=y
245CONFIG_ARCH_POPULATES_NODE_MAP=y 276CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -256,8 +287,6 @@ CONFIG_MIGRATION=y
256CONFIG_ZONE_DMA_FLAG=1 287CONFIG_ZONE_DMA_FLAG=1
257CONFIG_BOUNCE=y 288CONFIG_BOUNCE=y
258CONFIG_VIRT_TO_BUS=y 289CONFIG_VIRT_TO_BUS=y
259CONFIG_HAVE_MLOCK=y
260CONFIG_HAVE_MLOCKED_PAGE_BIT=y
261# CONFIG_KSM is not set 290# CONFIG_KSM is not set
262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 291CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263CONFIG_PPC_4K_PAGES=y 292CONFIG_PPC_4K_PAGES=y
@@ -375,9 +404,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
375# CONFIG_AF_RXRPC is not set 404# CONFIG_AF_RXRPC is not set
376CONFIG_WIRELESS=y 405CONFIG_WIRELESS=y
377# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
378CONFIG_CFG80211_DEFAULT_PS_VALUE=0
379CONFIG_WIRELESS_OLD_REGULATORY=y
380# CONFIG_WIRELESS_EXT is not set
381# CONFIG_LIB80211 is not set 407# CONFIG_LIB80211 is not set
382 408
383# 409#
@@ -407,6 +433,10 @@ CONFIG_BLK_DEV=y
407# CONFIG_BLK_DEV_COW_COMMON is not set 433# CONFIG_BLK_DEV_COW_COMMON is not set
408CONFIG_BLK_DEV_LOOP=y 434CONFIG_BLK_DEV_LOOP=y
409# CONFIG_BLK_DEV_CRYPTOLOOP is not set 435# CONFIG_BLK_DEV_CRYPTOLOOP is not set
436
437#
438# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
439#
410# CONFIG_BLK_DEV_NBD is not set 440# CONFIG_BLK_DEV_NBD is not set
411# CONFIG_BLK_DEV_RAM is not set 441# CONFIG_BLK_DEV_RAM is not set
412# CONFIG_CDROM_PKTCDVD is not set 442# CONFIG_CDROM_PKTCDVD is not set
@@ -485,8 +515,7 @@ CONFIG_NETDEV_1000=y
485# CONFIG_MV643XX_ETH is not set 515# CONFIG_MV643XX_ETH is not set
486CONFIG_NETDEV_10000=y 516CONFIG_NETDEV_10000=y
487CONFIG_WLAN=y 517CONFIG_WLAN=y
488# CONFIG_WLAN_PRE80211 is not set 518# CONFIG_HOSTAP is not set
489# CONFIG_WLAN_80211 is not set
490 519
491# 520#
492# Enable WiMAX (Networking options) to see the WiMAX drivers 521# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -506,6 +535,7 @@ CONFIG_WLAN=y
506CONFIG_INPUT=y 535CONFIG_INPUT=y
507# CONFIG_INPUT_FF_MEMLESS is not set 536# CONFIG_INPUT_FF_MEMLESS is not set
508# CONFIG_INPUT_POLLDEV is not set 537# CONFIG_INPUT_POLLDEV is not set
538# CONFIG_INPUT_SPARSEKMAP is not set
509 539
510# 540#
511# Userland interfaces 541# Userland interfaces
@@ -554,6 +584,7 @@ CONFIG_SERIO_SERPORT=y
554CONFIG_SERIO_LIBPS2=y 584CONFIG_SERIO_LIBPS2=y
555# CONFIG_SERIO_RAW is not set 585# CONFIG_SERIO_RAW is not set
556# CONFIG_SERIO_XILINX_XPS_PS2 is not set 586# CONFIG_SERIO_XILINX_XPS_PS2 is not set
587# CONFIG_SERIO_ALTERA_PS2 is not set
557# CONFIG_GAMEPORT is not set 588# CONFIG_GAMEPORT is not set
558 589
559# 590#
@@ -576,6 +607,7 @@ CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 607CONFIG_SERIAL_CORE_CONSOLE=y
577CONFIG_SERIAL_CPM=y 608CONFIG_SERIAL_CPM=y
578CONFIG_SERIAL_CPM_CONSOLE=y 609CONFIG_SERIAL_CPM_CONSOLE=y
610# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
579CONFIG_UNIX98_PTYS=y 611CONFIG_UNIX98_PTYS=y
580# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 612# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
581# CONFIG_LEGACY_PTYS is not set 613# CONFIG_LEGACY_PTYS is not set
@@ -855,6 +887,7 @@ CONFIG_FRAME_WARN=1024
855# CONFIG_DEBUG_MEMORY_INIT is not set 887# CONFIG_DEBUG_MEMORY_INIT is not set
856# CONFIG_RCU_CPU_STALL_DETECTOR is not set 888# CONFIG_RCU_CPU_STALL_DETECTOR is not set
857# CONFIG_LATENCYTOP is not set 889# CONFIG_LATENCYTOP is not set
890# CONFIG_SYSCTL_SYSCALL_CHECK is not set
858CONFIG_HAVE_FUNCTION_TRACER=y 891CONFIG_HAVE_FUNCTION_TRACER=y
859CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 892CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
860CONFIG_HAVE_DYNAMIC_FTRACE=y 893CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -876,7 +909,11 @@ CONFIG_PRINT_STACK_DEPTH=64
876# CONFIG_KEYS is not set 909# CONFIG_KEYS is not set
877# CONFIG_SECURITY is not set 910# CONFIG_SECURITY is not set
878# CONFIG_SECURITYFS is not set 911# CONFIG_SECURITYFS is not set
879# CONFIG_SECURITY_FILE_CAPABILITIES is not set 912# CONFIG_DEFAULT_SECURITY_SELINUX is not set
913# CONFIG_DEFAULT_SECURITY_SMACK is not set
914# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
915CONFIG_DEFAULT_SECURITY_DAC=y
916CONFIG_DEFAULT_SECURITY=""
880CONFIG_CRYPTO=y 917CONFIG_CRYPTO=y
881 918
882# 919#
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index 5b3abb42ae30..41884c97a4f3 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:16 2009 4# Wed Jan 6 09:24:09 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,6 +62,8 @@ CONFIG_AUDIT_ARCH=y
61CONFIG_GENERIC_BUG=y 62CONFIG_GENERIC_BUG=y
62CONFIG_DTC=y 63CONFIG_DTC=y
63CONFIG_DEFAULT_UIMAGE=y 64CONFIG_DEFAULT_UIMAGE=y
65CONFIG_ARCH_HIBERNATION_POSSIBLE=y
66CONFIG_ARCH_SUSPEND_POSSIBLE=y
64# CONFIG_PPC_DCR_NATIVE is not set 67# CONFIG_PPC_DCR_NATIVE is not set
65# CONFIG_PPC_DCR_MMIO is not set 68# CONFIG_PPC_DCR_MMIO is not set
66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 69CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -91,6 +94,7 @@ CONFIG_AUDIT=y
91# 94#
92CONFIG_TREE_RCU=y 95CONFIG_TREE_RCU=y
93# CONFIG_TREE_PREEMPT_RCU is not set 96# CONFIG_TREE_PREEMPT_RCU is not set
97# CONFIG_TINY_RCU is not set
94# CONFIG_RCU_TRACE is not set 98# CONFIG_RCU_TRACE is not set
95CONFIG_RCU_FANOUT=32 99CONFIG_RCU_FANOUT=32
96# CONFIG_RCU_FANOUT_EXACT is not set 100# CONFIG_RCU_FANOUT_EXACT is not set
@@ -183,14 +187,41 @@ CONFIG_LBDAF=y
183# IO Schedulers 187# IO Schedulers
184# 188#
185CONFIG_IOSCHED_NOOP=y 189CONFIG_IOSCHED_NOOP=y
186CONFIG_IOSCHED_AS=y
187CONFIG_IOSCHED_DEADLINE=y 190CONFIG_IOSCHED_DEADLINE=y
188CONFIG_IOSCHED_CFQ=y 191CONFIG_IOSCHED_CFQ=y
189# CONFIG_DEFAULT_AS is not set
190# CONFIG_DEFAULT_DEADLINE is not set 192# CONFIG_DEFAULT_DEADLINE is not set
191CONFIG_DEFAULT_CFQ=y 193CONFIG_DEFAULT_CFQ=y
192# CONFIG_DEFAULT_NOOP is not set 194# CONFIG_DEFAULT_NOOP is not set
193CONFIG_DEFAULT_IOSCHED="cfq" 195CONFIG_DEFAULT_IOSCHED="cfq"
196# CONFIG_INLINE_SPIN_TRYLOCK is not set
197# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
198# CONFIG_INLINE_SPIN_LOCK is not set
199# CONFIG_INLINE_SPIN_LOCK_BH is not set
200# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
201# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
202CONFIG_INLINE_SPIN_UNLOCK=y
203# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
204CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
205# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
206# CONFIG_INLINE_READ_TRYLOCK is not set
207# CONFIG_INLINE_READ_LOCK is not set
208# CONFIG_INLINE_READ_LOCK_BH is not set
209# CONFIG_INLINE_READ_LOCK_IRQ is not set
210# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
211CONFIG_INLINE_READ_UNLOCK=y
212# CONFIG_INLINE_READ_UNLOCK_BH is not set
213CONFIG_INLINE_READ_UNLOCK_IRQ=y
214# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
215# CONFIG_INLINE_WRITE_TRYLOCK is not set
216# CONFIG_INLINE_WRITE_LOCK is not set
217# CONFIG_INLINE_WRITE_LOCK_BH is not set
218# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
219# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
220CONFIG_INLINE_WRITE_UNLOCK=y
221# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
222CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
223# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
224CONFIG_MUTEX_SPIN_ON_OWNER=y
194# CONFIG_FREEZER is not set 225# CONFIG_FREEZER is not set
195 226
196# 227#
@@ -221,7 +252,7 @@ CONFIG_MPIC=y
221# CONFIG_MPIC_WEIRD is not set 252# CONFIG_MPIC_WEIRD is not set
222CONFIG_PPC_I8259=y 253CONFIG_PPC_I8259=y
223# CONFIG_PPC_RTAS is not set 254# CONFIG_PPC_RTAS is not set
224# CONFIG_MMIO_NVRAM is not set 255CONFIG_MMIO_NVRAM=y
225# CONFIG_PPC_MPC106 is not set 256# CONFIG_PPC_MPC106 is not set
226# CONFIG_PPC_970_NAP is not set 257# CONFIG_PPC_970_NAP is not set
227# CONFIG_PPC_INDIRECT_IO is not set 258# CONFIG_PPC_INDIRECT_IO is not set
@@ -262,6 +293,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
262# CONFIG_KEXEC is not set 293# CONFIG_KEXEC is not set
263# CONFIG_CRASH_DUMP is not set 294# CONFIG_CRASH_DUMP is not set
264# CONFIG_IRQ_ALL_CPUS is not set 295# CONFIG_IRQ_ALL_CPUS is not set
296CONFIG_SPARSE_IRQ=y
265CONFIG_MAX_ACTIVE_REGIONS=32 297CONFIG_MAX_ACTIVE_REGIONS=32
266CONFIG_ARCH_FLATMEM_ENABLE=y 298CONFIG_ARCH_FLATMEM_ENABLE=y
267CONFIG_ARCH_POPULATES_NODE_MAP=y 299CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -278,8 +310,6 @@ CONFIG_MIGRATION=y
278CONFIG_ZONE_DMA_FLAG=1 310CONFIG_ZONE_DMA_FLAG=1
279CONFIG_BOUNCE=y 311CONFIG_BOUNCE=y
280CONFIG_VIRT_TO_BUS=y 312CONFIG_VIRT_TO_BUS=y
281CONFIG_HAVE_MLOCK=y
282CONFIG_HAVE_MLOCKED_PAGE_BIT=y
283# CONFIG_KSM is not set 313# CONFIG_KSM is not set
284CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 314CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
285CONFIG_PPC_4K_PAGES=y 315CONFIG_PPC_4K_PAGES=y
@@ -397,6 +427,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
397CONFIG_INET6_XFRM_MODE_BEET=y 427CONFIG_INET6_XFRM_MODE_BEET=y
398# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 428# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
399CONFIG_IPV6_SIT=y 429CONFIG_IPV6_SIT=y
430# CONFIG_IPV6_SIT_6RD is not set
400CONFIG_IPV6_NDISC_NODETYPE=y 431CONFIG_IPV6_NDISC_NODETYPE=y
401# CONFIG_IPV6_TUNNEL is not set 432# CONFIG_IPV6_TUNNEL is not set
402# CONFIG_IPV6_MULTIPLE_TABLES is not set 433# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -441,9 +472,6 @@ CONFIG_SCTP_HMAC_MD5=y
441CONFIG_FIB_RULES=y 472CONFIG_FIB_RULES=y
442CONFIG_WIRELESS=y 473CONFIG_WIRELESS=y
443# CONFIG_CFG80211 is not set 474# CONFIG_CFG80211 is not set
444CONFIG_CFG80211_DEFAULT_PS_VALUE=0
445CONFIG_WIRELESS_OLD_REGULATORY=y
446# CONFIG_WIRELESS_EXT is not set
447# CONFIG_LIB80211 is not set 475# CONFIG_LIB80211 is not set
448 476
449# 477#
@@ -486,6 +514,10 @@ CONFIG_BLK_DEV=y
486# CONFIG_BLK_DEV_COW_COMMON is not set 514# CONFIG_BLK_DEV_COW_COMMON is not set
487CONFIG_BLK_DEV_LOOP=y 515CONFIG_BLK_DEV_LOOP=y
488# CONFIG_BLK_DEV_CRYPTOLOOP is not set 516# CONFIG_BLK_DEV_CRYPTOLOOP is not set
517
518#
519# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
520#
489CONFIG_BLK_DEV_NBD=y 521CONFIG_BLK_DEV_NBD=y
490# CONFIG_BLK_DEV_SX8 is not set 522# CONFIG_BLK_DEV_SX8 is not set
491# CONFIG_BLK_DEV_UB is not set 523# CONFIG_BLK_DEV_UB is not set
@@ -497,6 +529,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
497# CONFIG_ATA_OVER_ETH is not set 529# CONFIG_ATA_OVER_ETH is not set
498# CONFIG_BLK_DEV_HD is not set 530# CONFIG_BLK_DEV_HD is not set
499CONFIG_MISC_DEVICES=y 531CONFIG_MISC_DEVICES=y
532# CONFIG_AD525X_DPOT is not set
500# CONFIG_PHANTOM is not set 533# CONFIG_PHANTOM is not set
501# CONFIG_SGI_IOC4 is not set 534# CONFIG_SGI_IOC4 is not set
502# CONFIG_TIFM_CORE is not set 535# CONFIG_TIFM_CORE is not set
@@ -504,6 +537,7 @@ CONFIG_MISC_DEVICES=y
504# CONFIG_ENCLOSURE_SERVICES is not set 537# CONFIG_ENCLOSURE_SERVICES is not set
505# CONFIG_HP_ILO is not set 538# CONFIG_HP_ILO is not set
506# CONFIG_ISL29003 is not set 539# CONFIG_ISL29003 is not set
540# CONFIG_DS1682 is not set
507# CONFIG_C2PORT is not set 541# CONFIG_C2PORT is not set
508 542
509# 543#
@@ -557,7 +591,9 @@ CONFIG_SCSI_LOWLEVEL=y
557# CONFIG_SCSI_BNX2_ISCSI is not set 591# CONFIG_SCSI_BNX2_ISCSI is not set
558# CONFIG_BE2ISCSI is not set 592# CONFIG_BE2ISCSI is not set
559# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 593# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
594# CONFIG_SCSI_HPSA is not set
560# CONFIG_SCSI_3W_9XXX is not set 595# CONFIG_SCSI_3W_9XXX is not set
596# CONFIG_SCSI_3W_SAS is not set
561# CONFIG_SCSI_ACARD is not set 597# CONFIG_SCSI_ACARD is not set
562# CONFIG_SCSI_AACRAID is not set 598# CONFIG_SCSI_AACRAID is not set
563# CONFIG_SCSI_AIC7XXX is not set 599# CONFIG_SCSI_AIC7XXX is not set
@@ -596,6 +632,7 @@ CONFIG_SCSI_LOWLEVEL=y
596# CONFIG_SCSI_NSP32 is not set 632# CONFIG_SCSI_NSP32 is not set
597# CONFIG_SCSI_DEBUG is not set 633# CONFIG_SCSI_DEBUG is not set
598# CONFIG_SCSI_PMCRAID is not set 634# CONFIG_SCSI_PMCRAID is not set
635# CONFIG_SCSI_PM8001 is not set
599# CONFIG_SCSI_SRP is not set 636# CONFIG_SCSI_SRP is not set
600# CONFIG_SCSI_BFA_FC is not set 637# CONFIG_SCSI_BFA_FC is not set
601# CONFIG_SCSI_DH is not set 638# CONFIG_SCSI_DH is not set
@@ -651,15 +688,16 @@ CONFIG_PATA_ALI=y
651# CONFIG_PATA_NS87415 is not set 688# CONFIG_PATA_NS87415 is not set
652# CONFIG_PATA_OPTI is not set 689# CONFIG_PATA_OPTI is not set
653# CONFIG_PATA_OPTIDMA is not set 690# CONFIG_PATA_OPTIDMA is not set
691# CONFIG_PATA_PDC2027X is not set
654# CONFIG_PATA_PDC_OLD is not set 692# CONFIG_PATA_PDC_OLD is not set
655# CONFIG_PATA_RADISYS is not set 693# CONFIG_PATA_RADISYS is not set
656# CONFIG_PATA_RDC is not set 694# CONFIG_PATA_RDC is not set
657# CONFIG_PATA_RZ1000 is not set 695# CONFIG_PATA_RZ1000 is not set
658# CONFIG_PATA_SC1200 is not set 696# CONFIG_PATA_SC1200 is not set
659# CONFIG_PATA_SERVERWORKS is not set 697# CONFIG_PATA_SERVERWORKS is not set
660# CONFIG_PATA_PDC2027X is not set
661# CONFIG_PATA_SIL680 is not set 698# CONFIG_PATA_SIL680 is not set
662# CONFIG_PATA_SIS is not set 699# CONFIG_PATA_SIS is not set
700# CONFIG_PATA_TOSHIBA is not set
663# CONFIG_PATA_VIA is not set 701# CONFIG_PATA_VIA is not set
664# CONFIG_PATA_WINBOND is not set 702# CONFIG_PATA_WINBOND is not set
665# CONFIG_PATA_PLATFORM is not set 703# CONFIG_PATA_PLATFORM is not set
@@ -676,7 +714,7 @@ CONFIG_PATA_ALI=y
676# 714#
677 715
678# 716#
679# See the help texts for more information. 717# The newer stack is recommended.
680# 718#
681# CONFIG_FIREWIRE is not set 719# CONFIG_FIREWIRE is not set
682# CONFIG_IEEE1394 is not set 720# CONFIG_IEEE1394 is not set
@@ -781,8 +819,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
781# CONFIG_BE2NET is not set 819# CONFIG_BE2NET is not set
782# CONFIG_TR is not set 820# CONFIG_TR is not set
783CONFIG_WLAN=y 821CONFIG_WLAN=y
784# CONFIG_WLAN_PRE80211 is not set 822# CONFIG_AIRO is not set
785# CONFIG_WLAN_80211 is not set 823# CONFIG_ATMEL is not set
824# CONFIG_PRISM54 is not set
825# CONFIG_USB_ZD1201 is not set
826# CONFIG_HOSTAP is not set
786 827
787# 828#
788# Enable WiMAX (Networking options) to see the WiMAX drivers 829# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -805,6 +846,7 @@ CONFIG_WLAN=y
805# CONFIG_NETCONSOLE is not set 846# CONFIG_NETCONSOLE is not set
806# CONFIG_NETPOLL is not set 847# CONFIG_NETPOLL is not set
807# CONFIG_NET_POLL_CONTROLLER is not set 848# CONFIG_NET_POLL_CONTROLLER is not set
849# CONFIG_VMXNET3 is not set
808# CONFIG_ISDN is not set 850# CONFIG_ISDN is not set
809# CONFIG_PHONE is not set 851# CONFIG_PHONE is not set
810 852
@@ -814,6 +856,7 @@ CONFIG_WLAN=y
814CONFIG_INPUT=y 856CONFIG_INPUT=y
815CONFIG_INPUT_FF_MEMLESS=m 857CONFIG_INPUT_FF_MEMLESS=m
816# CONFIG_INPUT_POLLDEV is not set 858# CONFIG_INPUT_POLLDEV is not set
859# CONFIG_INPUT_SPARSEKMAP is not set
817 860
818# 861#
819# Userland interfaces 862# Userland interfaces
@@ -843,6 +886,7 @@ CONFIG_SERIO_SERPORT=y
843CONFIG_SERIO_LIBPS2=y 886CONFIG_SERIO_LIBPS2=y
844# CONFIG_SERIO_RAW is not set 887# CONFIG_SERIO_RAW is not set
845# CONFIG_SERIO_XILINX_XPS_PS2 is not set 888# CONFIG_SERIO_XILINX_XPS_PS2 is not set
889# CONFIG_SERIO_ALTERA_PS2 is not set
846# CONFIG_GAMEPORT is not set 890# CONFIG_GAMEPORT is not set
847 891
848# 892#
@@ -879,6 +923,7 @@ CONFIG_SERIAL_CORE=y
879CONFIG_SERIAL_CORE_CONSOLE=y 923CONFIG_SERIAL_CORE_CONSOLE=y
880# CONFIG_SERIAL_JSM is not set 924# CONFIG_SERIAL_JSM is not set
881# CONFIG_SERIAL_OF_PLATFORM is not set 925# CONFIG_SERIAL_OF_PLATFORM is not set
926# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
882CONFIG_UNIX98_PTYS=y 927CONFIG_UNIX98_PTYS=y
883# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 928# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
884CONFIG_LEGACY_PTYS=y 929CONFIG_LEGACY_PTYS=y
@@ -936,11 +981,6 @@ CONFIG_I2C_MPC=y
936# CONFIG_I2C_TINY_USB is not set 981# CONFIG_I2C_TINY_USB is not set
937 982
938# 983#
939# Graphics adapter I2C/DDC channel drivers
940#
941# CONFIG_I2C_VOODOO3 is not set
942
943#
944# Other I2C/SMBus bus drivers 984# Other I2C/SMBus bus drivers
945# 985#
946# CONFIG_I2C_PCA_PLATFORM is not set 986# CONFIG_I2C_PCA_PLATFORM is not set
@@ -949,7 +989,6 @@ CONFIG_I2C_MPC=y
949# 989#
950# Miscellaneous I2C Chip support 990# Miscellaneous I2C Chip support
951# 991#
952# CONFIG_DS1682 is not set
953# CONFIG_SENSORS_TSL2550 is not set 992# CONFIG_SENSORS_TSL2550 is not set
954# CONFIG_I2C_DEBUG_CORE is not set 993# CONFIG_I2C_DEBUG_CORE is not set
955# CONFIG_I2C_DEBUG_ALGO is not set 994# CONFIG_I2C_DEBUG_ALGO is not set
@@ -982,6 +1021,7 @@ CONFIG_GPIOLIB=y
982# 1021#
983# PCI GPIO expanders: 1022# PCI GPIO expanders:
984# 1023#
1024# CONFIG_GPIO_CS5535 is not set
985# CONFIG_GPIO_BT8XX is not set 1025# CONFIG_GPIO_BT8XX is not set
986# CONFIG_GPIO_LANGWELL is not set 1026# CONFIG_GPIO_LANGWELL is not set
987 1027
@@ -1015,11 +1055,13 @@ CONFIG_SSB_POSSIBLE=y
1015# CONFIG_TWL4030_CORE is not set 1055# CONFIG_TWL4030_CORE is not set
1016# CONFIG_MFD_TMIO is not set 1056# CONFIG_MFD_TMIO is not set
1017# CONFIG_PMIC_DA903X is not set 1057# CONFIG_PMIC_DA903X is not set
1058# CONFIG_PMIC_ADP5520 is not set
1018# CONFIG_MFD_WM8400 is not set 1059# CONFIG_MFD_WM8400 is not set
1019# CONFIG_MFD_WM831X is not set 1060# CONFIG_MFD_WM831X is not set
1020# CONFIG_MFD_WM8350_I2C is not set 1061# CONFIG_MFD_WM8350_I2C is not set
1021# CONFIG_MFD_PCF50633 is not set 1062# CONFIG_MFD_PCF50633 is not set
1022# CONFIG_AB3100_CORE is not set 1063# CONFIG_AB3100_CORE is not set
1064# CONFIG_MFD_88PM8607 is not set
1023# CONFIG_REGULATOR is not set 1065# CONFIG_REGULATOR is not set
1024# CONFIG_MEDIA_SUPPORT is not set 1066# CONFIG_MEDIA_SUPPORT is not set
1025 1067
@@ -1094,6 +1136,7 @@ CONFIG_SND_PCI=y
1094# CONFIG_SND_CS4281 is not set 1136# CONFIG_SND_CS4281 is not set
1095# CONFIG_SND_CS46XX is not set 1137# CONFIG_SND_CS46XX is not set
1096# CONFIG_SND_CS5530 is not set 1138# CONFIG_SND_CS5530 is not set
1139# CONFIG_SND_CS5535AUDIO is not set
1097# CONFIG_SND_CTXFI is not set 1140# CONFIG_SND_CTXFI is not set
1098# CONFIG_SND_DARLA20 is not set 1141# CONFIG_SND_DARLA20 is not set
1099# CONFIG_SND_GINA20 is not set 1142# CONFIG_SND_GINA20 is not set
@@ -1221,6 +1264,7 @@ CONFIG_USB_MON=y
1221CONFIG_USB_EHCI_HCD=y 1264CONFIG_USB_EHCI_HCD=y
1222# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1265# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1223# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1266# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1267# CONFIG_XPS_USB_HCD_XILINX is not set
1224# CONFIG_USB_EHCI_FSL is not set 1268# CONFIG_USB_EHCI_FSL is not set
1225CONFIG_USB_EHCI_HCD_PPC_OF=y 1269CONFIG_USB_EHCI_HCD_PPC_OF=y
1226# CONFIG_USB_OXU210HP_HCD is not set 1270# CONFIG_USB_OXU210HP_HCD is not set
@@ -1348,6 +1392,7 @@ CONFIG_RTC_INTF_DEV=y
1348# CONFIG_RTC_DRV_PCF8563 is not set 1392# CONFIG_RTC_DRV_PCF8563 is not set
1349# CONFIG_RTC_DRV_PCF8583 is not set 1393# CONFIG_RTC_DRV_PCF8583 is not set
1350# CONFIG_RTC_DRV_M41T80 is not set 1394# CONFIG_RTC_DRV_M41T80 is not set
1395# CONFIG_RTC_DRV_BQ32K is not set
1351# CONFIG_RTC_DRV_S35390A is not set 1396# CONFIG_RTC_DRV_S35390A is not set
1352# CONFIG_RTC_DRV_FM3130 is not set 1397# CONFIG_RTC_DRV_FM3130 is not set
1353# CONFIG_RTC_DRV_RX8581 is not set 1398# CONFIG_RTC_DRV_RX8581 is not set
@@ -1369,7 +1414,9 @@ CONFIG_RTC_DRV_CMOS=y
1369# CONFIG_RTC_DRV_M48T86 is not set 1414# CONFIG_RTC_DRV_M48T86 is not set
1370# CONFIG_RTC_DRV_M48T35 is not set 1415# CONFIG_RTC_DRV_M48T35 is not set
1371# CONFIG_RTC_DRV_M48T59 is not set 1416# CONFIG_RTC_DRV_M48T59 is not set
1417# CONFIG_RTC_DRV_MSM6242 is not set
1372# CONFIG_RTC_DRV_BQ4802 is not set 1418# CONFIG_RTC_DRV_BQ4802 is not set
1419# CONFIG_RTC_DRV_RP5C01 is not set
1373# CONFIG_RTC_DRV_V3020 is not set 1420# CONFIG_RTC_DRV_V3020 is not set
1374 1421
1375# 1422#
@@ -1684,7 +1731,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1684# CONFIG_KEYS is not set 1731# CONFIG_KEYS is not set
1685# CONFIG_SECURITY is not set 1732# CONFIG_SECURITY is not set
1686# CONFIG_SECURITYFS is not set 1733# CONFIG_SECURITYFS is not set
1687# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1734# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1735# CONFIG_DEFAULT_SECURITY_SMACK is not set
1736# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1737CONFIG_DEFAULT_SECURITY_DAC=y
1738CONFIG_DEFAULT_SECURITY=""
1688CONFIG_CRYPTO=y 1739CONFIG_CRYPTO=y
1689 1740
1690# 1741#
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index 1da3488a603d..6b9e6bd2c98d 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:17 2009 4# Wed Jan 6 09:24:10 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 33# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
34CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
35CONFIG_NR_IRQS=512
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
36CONFIG_HAVE_LATENCYTOP_SUPPORT=y 37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
37CONFIG_TRACE_IRQFLAGS_SUPPORT=y 38CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -54,6 +55,7 @@ CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 55CONFIG_GENERIC_BUG=y
55CONFIG_DTC=y 56CONFIG_DTC=y
56# CONFIG_DEFAULT_UIMAGE is not set 57# CONFIG_DEFAULT_UIMAGE is not set
58CONFIG_ARCH_HIBERNATION_POSSIBLE=y
57# CONFIG_PPC_DCR_NATIVE is not set 59# CONFIG_PPC_DCR_NATIVE is not set
58# CONFIG_PPC_DCR_MMIO is not set 60# CONFIG_PPC_DCR_MMIO is not set
59CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 61CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -81,6 +83,7 @@ CONFIG_SYSVIPC_SYSCTL=y
81# 83#
82CONFIG_TREE_RCU=y 84CONFIG_TREE_RCU=y
83# CONFIG_TREE_PREEMPT_RCU is not set 85# CONFIG_TREE_PREEMPT_RCU is not set
86# CONFIG_TINY_RCU is not set
84# CONFIG_RCU_TRACE is not set 87# CONFIG_RCU_TRACE is not set
85CONFIG_RCU_FANOUT=32 88CONFIG_RCU_FANOUT=32
86# CONFIG_RCU_FANOUT_EXACT is not set 89# CONFIG_RCU_FANOUT_EXACT is not set
@@ -159,14 +162,41 @@ CONFIG_LBDAF=y
159# IO Schedulers 162# IO Schedulers
160# 163#
161CONFIG_IOSCHED_NOOP=y 164CONFIG_IOSCHED_NOOP=y
162# CONFIG_IOSCHED_AS is not set
163CONFIG_IOSCHED_DEADLINE=y 165CONFIG_IOSCHED_DEADLINE=y
164# CONFIG_IOSCHED_CFQ is not set 166# CONFIG_IOSCHED_CFQ is not set
165# CONFIG_DEFAULT_AS is not set
166CONFIG_DEFAULT_DEADLINE=y 167CONFIG_DEFAULT_DEADLINE=y
167# CONFIG_DEFAULT_CFQ is not set 168# CONFIG_DEFAULT_CFQ is not set
168# CONFIG_DEFAULT_NOOP is not set 169# CONFIG_DEFAULT_NOOP is not set
169CONFIG_DEFAULT_IOSCHED="deadline" 170CONFIG_DEFAULT_IOSCHED="deadline"
171# CONFIG_INLINE_SPIN_TRYLOCK is not set
172# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
173# CONFIG_INLINE_SPIN_LOCK is not set
174# CONFIG_INLINE_SPIN_LOCK_BH is not set
175# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
176# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
177CONFIG_INLINE_SPIN_UNLOCK=y
178# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
179CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
180# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
181# CONFIG_INLINE_READ_TRYLOCK is not set
182# CONFIG_INLINE_READ_LOCK is not set
183# CONFIG_INLINE_READ_LOCK_BH is not set
184# CONFIG_INLINE_READ_LOCK_IRQ is not set
185# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
186CONFIG_INLINE_READ_UNLOCK=y
187# CONFIG_INLINE_READ_UNLOCK_BH is not set
188CONFIG_INLINE_READ_UNLOCK_IRQ=y
189# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
190# CONFIG_INLINE_WRITE_TRYLOCK is not set
191# CONFIG_INLINE_WRITE_LOCK is not set
192# CONFIG_INLINE_WRITE_LOCK_BH is not set
193# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
194# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
195CONFIG_INLINE_WRITE_UNLOCK=y
196# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
197CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
198# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
199# CONFIG_MUTEX_SPIN_ON_OWNER is not set
170# CONFIG_FREEZER is not set 200# CONFIG_FREEZER is not set
171 201
172# 202#
@@ -248,6 +278,7 @@ CONFIG_8XX_MINIMAL_FPEMU=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 278CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
249CONFIG_ARCH_HAS_WALK_MEMORY=y 279CONFIG_ARCH_HAS_WALK_MEMORY=y
250CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
281CONFIG_SPARSE_IRQ=y
251CONFIG_MAX_ACTIVE_REGIONS=32 282CONFIG_MAX_ACTIVE_REGIONS=32
252CONFIG_ARCH_FLATMEM_ENABLE=y 283CONFIG_ARCH_FLATMEM_ENABLE=y
253CONFIG_ARCH_POPULATES_NODE_MAP=y 284CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -264,8 +295,6 @@ CONFIG_MIGRATION=y
264CONFIG_ZONE_DMA_FLAG=1 295CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 296CONFIG_BOUNCE=y
266CONFIG_VIRT_TO_BUS=y 297CONFIG_VIRT_TO_BUS=y
267CONFIG_HAVE_MLOCK=y
268CONFIG_HAVE_MLOCKED_PAGE_BIT=y
269# CONFIG_KSM is not set 298# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 299CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271CONFIG_PPC_4K_PAGES=y 300CONFIG_PPC_4K_PAGES=y
@@ -379,9 +408,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
379# CONFIG_AF_RXRPC is not set 408# CONFIG_AF_RXRPC is not set
380CONFIG_WIRELESS=y 409CONFIG_WIRELESS=y
381# CONFIG_CFG80211 is not set 410# CONFIG_CFG80211 is not set
382CONFIG_CFG80211_DEFAULT_PS_VALUE=0
383CONFIG_WIRELESS_OLD_REGULATORY=y
384# CONFIG_WIRELESS_EXT is not set
385# CONFIG_LIB80211 is not set 411# CONFIG_LIB80211 is not set
386 412
387# 413#
@@ -556,8 +582,7 @@ CONFIG_FS_ENET_MDIO_FEC=y
556# CONFIG_NETDEV_1000 is not set 582# CONFIG_NETDEV_1000 is not set
557# CONFIG_NETDEV_10000 is not set 583# CONFIG_NETDEV_10000 is not set
558CONFIG_WLAN=y 584CONFIG_WLAN=y
559# CONFIG_WLAN_PRE80211 is not set 585# CONFIG_HOSTAP is not set
560# CONFIG_WLAN_80211 is not set
561 586
562# 587#
563# Enable WiMAX (Networking options) to see the WiMAX drivers 588# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -602,6 +627,7 @@ CONFIG_SERIAL_CORE=y
602CONFIG_SERIAL_CORE_CONSOLE=y 627CONFIG_SERIAL_CORE_CONSOLE=y
603CONFIG_SERIAL_CPM=y 628CONFIG_SERIAL_CPM=y
604CONFIG_SERIAL_CPM_CONSOLE=y 629CONFIG_SERIAL_CPM_CONSOLE=y
630# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
605CONFIG_UNIX98_PTYS=y 631CONFIG_UNIX98_PTYS=y
606# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 632# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
607# CONFIG_LEGACY_PTYS is not set 633# CONFIG_LEGACY_PTYS is not set
@@ -862,6 +888,7 @@ CONFIG_DEBUG_INFO=y
862# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 888# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
863# CONFIG_FAULT_INJECTION is not set 889# CONFIG_FAULT_INJECTION is not set
864# CONFIG_LATENCYTOP is not set 890# CONFIG_LATENCYTOP is not set
891# CONFIG_SYSCTL_SYSCALL_CHECK is not set
865# CONFIG_DEBUG_PAGEALLOC is not set 892# CONFIG_DEBUG_PAGEALLOC is not set
866CONFIG_HAVE_FUNCTION_TRACER=y 893CONFIG_HAVE_FUNCTION_TRACER=y
867CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 894CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -904,7 +931,11 @@ CONFIG_PRINT_STACK_DEPTH=64
904# CONFIG_KEYS is not set 931# CONFIG_KEYS is not set
905# CONFIG_SECURITY is not set 932# CONFIG_SECURITY is not set
906# CONFIG_SECURITYFS is not set 933# CONFIG_SECURITYFS is not set
907# CONFIG_SECURITY_FILE_CAPABILITIES is not set 934# CONFIG_DEFAULT_SECURITY_SELINUX is not set
935# CONFIG_DEFAULT_SECURITY_SMACK is not set
936# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
937CONFIG_DEFAULT_SECURITY_DAC=y
938CONFIG_DEFAULT_SECURITY=""
908# CONFIG_CRYPTO is not set 939# CONFIG_CRYPTO is not set
909CONFIG_PPC_CLOCK=y 940CONFIG_PPC_CLOCK=y
910CONFIG_PPC_LIB_RHEAP=y 941CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index b7911216af78..5d06f2cb8e5e 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:17 2009 4# Wed Jan 6 09:24:11 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
59CONFIG_GENERIC_BUG=y 60CONFIG_GENERIC_BUG=y
60CONFIG_DTC=y 61CONFIG_DTC=y
61CONFIG_DEFAULT_UIMAGE=y 62CONFIG_DEFAULT_UIMAGE=y
63CONFIG_ARCH_HIBERNATION_POSSIBLE=y
62# CONFIG_PPC_DCR_NATIVE is not set 64# CONFIG_PPC_DCR_NATIVE is not set
63# CONFIG_PPC_DCR_MMIO is not set 65# CONFIG_PPC_DCR_MMIO is not set
64CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 66CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -165,14 +168,41 @@ CONFIG_BLK_DEV_BSG=y
165# IO Schedulers 168# IO Schedulers
166# 169#
167CONFIG_IOSCHED_NOOP=y 170CONFIG_IOSCHED_NOOP=y
168CONFIG_IOSCHED_AS=y
169CONFIG_IOSCHED_DEADLINE=y 171CONFIG_IOSCHED_DEADLINE=y
170CONFIG_IOSCHED_CFQ=y 172CONFIG_IOSCHED_CFQ=y
171CONFIG_DEFAULT_AS=y
172# CONFIG_DEFAULT_DEADLINE is not set 173# CONFIG_DEFAULT_DEADLINE is not set
173# CONFIG_DEFAULT_CFQ is not set 174CONFIG_DEFAULT_CFQ=y
174# CONFIG_DEFAULT_NOOP is not set 175# CONFIG_DEFAULT_NOOP is not set
175CONFIG_DEFAULT_IOSCHED="anticipatory" 176CONFIG_DEFAULT_IOSCHED="cfq"
177# CONFIG_INLINE_SPIN_TRYLOCK is not set
178# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
179# CONFIG_INLINE_SPIN_LOCK is not set
180# CONFIG_INLINE_SPIN_LOCK_BH is not set
181# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
182# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
183CONFIG_INLINE_SPIN_UNLOCK=y
184# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
185CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
186# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
187# CONFIG_INLINE_READ_TRYLOCK is not set
188# CONFIG_INLINE_READ_LOCK is not set
189# CONFIG_INLINE_READ_LOCK_BH is not set
190# CONFIG_INLINE_READ_LOCK_IRQ is not set
191# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
192CONFIG_INLINE_READ_UNLOCK=y
193# CONFIG_INLINE_READ_UNLOCK_BH is not set
194CONFIG_INLINE_READ_UNLOCK_IRQ=y
195# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
196# CONFIG_INLINE_WRITE_TRYLOCK is not set
197# CONFIG_INLINE_WRITE_LOCK is not set
198# CONFIG_INLINE_WRITE_LOCK_BH is not set
199# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
200# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
201CONFIG_INLINE_WRITE_UNLOCK=y
202# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
203CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
204# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
205# CONFIG_MUTEX_SPIN_ON_OWNER is not set
176# CONFIG_FREEZER is not set 206# CONFIG_FREEZER is not set
177 207
178# 208#
@@ -243,6 +273,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
243CONFIG_ARCH_HAS_WALK_MEMORY=y 273CONFIG_ARCH_HAS_WALK_MEMORY=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 274CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245# CONFIG_CRASH_DUMP is not set 275# CONFIG_CRASH_DUMP is not set
276CONFIG_SPARSE_IRQ=y
246CONFIG_MAX_ACTIVE_REGIONS=32 277CONFIG_MAX_ACTIVE_REGIONS=32
247CONFIG_ARCH_FLATMEM_ENABLE=y 278CONFIG_ARCH_FLATMEM_ENABLE=y
248CONFIG_ARCH_POPULATES_NODE_MAP=y 279CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -255,8 +286,6 @@ CONFIG_MIGRATION=y
255CONFIG_ZONE_DMA_FLAG=1 286CONFIG_ZONE_DMA_FLAG=1
256CONFIG_BOUNCE=y 287CONFIG_BOUNCE=y
257CONFIG_VIRT_TO_BUS=y 288CONFIG_VIRT_TO_BUS=y
258CONFIG_HAVE_MLOCK=y
259CONFIG_HAVE_MLOCKED_PAGE_BIT=y
260# CONFIG_KSM is not set 289# CONFIG_KSM is not set
261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 290CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
262CONFIG_PPC_4K_PAGES=y 291CONFIG_PPC_4K_PAGES=y
@@ -407,9 +436,6 @@ CONFIG_NETFILTER_ADVANCED=y
407# CONFIG_BT is not set 436# CONFIG_BT is not set
408CONFIG_WIRELESS=y 437CONFIG_WIRELESS=y
409# CONFIG_CFG80211 is not set 438# CONFIG_CFG80211 is not set
410CONFIG_CFG80211_DEFAULT_PS_VALUE=0
411CONFIG_WIRELESS_OLD_REGULATORY=y
412# CONFIG_WIRELESS_EXT is not set
413# CONFIG_LIB80211 is not set 439# CONFIG_LIB80211 is not set
414 440
415# 441#
@@ -530,6 +556,10 @@ CONFIG_BLK_DEV=y
530# CONFIG_BLK_DEV_COW_COMMON is not set 556# CONFIG_BLK_DEV_COW_COMMON is not set
531CONFIG_BLK_DEV_LOOP=y 557CONFIG_BLK_DEV_LOOP=y
532# CONFIG_BLK_DEV_CRYPTOLOOP is not set 558# CONFIG_BLK_DEV_CRYPTOLOOP is not set
559
560#
561# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
562#
533# CONFIG_BLK_DEV_NBD is not set 563# CONFIG_BLK_DEV_NBD is not set
534# CONFIG_BLK_DEV_SX8 is not set 564# CONFIG_BLK_DEV_SX8 is not set
535# CONFIG_BLK_DEV_RAM is not set 565# CONFIG_BLK_DEV_RAM is not set
@@ -616,7 +646,7 @@ CONFIG_IDE_PROC_FS=y
616# 646#
617 647
618# 648#
619# See the help texts for more information. 649# The newer stack is recommended.
620# 650#
621# CONFIG_FIREWIRE is not set 651# CONFIG_FIREWIRE is not set
622# CONFIG_IEEE1394 is not set 652# CONFIG_IEEE1394 is not set
@@ -721,8 +751,9 @@ CONFIG_CHELSIO_T3_DEPENDS=y
721# CONFIG_BE2NET is not set 751# CONFIG_BE2NET is not set
722# CONFIG_TR is not set 752# CONFIG_TR is not set
723CONFIG_WLAN=y 753CONFIG_WLAN=y
724# CONFIG_WLAN_PRE80211 is not set 754# CONFIG_AIRO is not set
725# CONFIG_WLAN_80211 is not set 755# CONFIG_ATMEL is not set
756# CONFIG_HOSTAP is not set
726 757
727# 758#
728# Enable WiMAX (Networking options) to see the WiMAX drivers 759# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -739,6 +770,7 @@ CONFIG_PPP_DEFLATE=y
739CONFIG_SLHC=y 770CONFIG_SLHC=y
740# CONFIG_NETPOLL is not set 771# CONFIG_NETPOLL is not set
741# CONFIG_NET_POLL_CONTROLLER is not set 772# CONFIG_NET_POLL_CONTROLLER is not set
773# CONFIG_VMXNET3 is not set
742# CONFIG_ISDN is not set 774# CONFIG_ISDN is not set
743# CONFIG_PHONE is not set 775# CONFIG_PHONE is not set
744 776
@@ -748,6 +780,7 @@ CONFIG_SLHC=y
748CONFIG_INPUT=y 780CONFIG_INPUT=y
749# CONFIG_INPUT_FF_MEMLESS is not set 781# CONFIG_INPUT_FF_MEMLESS is not set
750# CONFIG_INPUT_POLLDEV is not set 782# CONFIG_INPUT_POLLDEV is not set
783# CONFIG_INPUT_SPARSEKMAP is not set
751 784
752# 785#
753# Userland interfaces 786# Userland interfaces
@@ -802,6 +835,7 @@ CONFIG_SERIO_SERPORT=y
802CONFIG_SERIO_LIBPS2=y 835CONFIG_SERIO_LIBPS2=y
803# CONFIG_SERIO_RAW is not set 836# CONFIG_SERIO_RAW is not set
804# CONFIG_SERIO_XILINX_XPS_PS2 is not set 837# CONFIG_SERIO_XILINX_XPS_PS2 is not set
838# CONFIG_SERIO_ALTERA_PS2 is not set
805# CONFIG_GAMEPORT is not set 839# CONFIG_GAMEPORT is not set
806 840
807# 841#
@@ -825,6 +859,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
825CONFIG_SERIAL_CPM=y 859CONFIG_SERIAL_CPM=y
826CONFIG_SERIAL_CPM_CONSOLE=y 860CONFIG_SERIAL_CPM_CONSOLE=y
827# CONFIG_SERIAL_JSM is not set 861# CONFIG_SERIAL_JSM is not set
862# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
828CONFIG_UNIX98_PTYS=y 863CONFIG_UNIX98_PTYS=y
829# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 864# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
830CONFIG_LEGACY_PTYS=y 865CONFIG_LEGACY_PTYS=y
@@ -861,6 +896,7 @@ CONFIG_GPIOLIB=y
861# 896#
862# PCI GPIO expanders: 897# PCI GPIO expanders:
863# 898#
899# CONFIG_GPIO_CS5535 is not set
864# CONFIG_GPIO_BT8XX is not set 900# CONFIG_GPIO_BT8XX is not set
865# CONFIG_GPIO_LANGWELL is not set 901# CONFIG_GPIO_LANGWELL is not set
866 902
@@ -955,10 +991,12 @@ CONFIG_USB_ETH_RNDIS=y
955# CONFIG_USB_ETH_EEM is not set 991# CONFIG_USB_ETH_EEM is not set
956# CONFIG_USB_GADGETFS is not set 992# CONFIG_USB_GADGETFS is not set
957# CONFIG_USB_FILE_STORAGE is not set 993# CONFIG_USB_FILE_STORAGE is not set
994# CONFIG_USB_MASS_STORAGE is not set
958# CONFIG_USB_G_SERIAL is not set 995# CONFIG_USB_G_SERIAL is not set
959# CONFIG_USB_MIDI_GADGET is not set 996# CONFIG_USB_MIDI_GADGET is not set
960# CONFIG_USB_G_PRINTER is not set 997# CONFIG_USB_G_PRINTER is not set
961# CONFIG_USB_CDC_COMPOSITE is not set 998# CONFIG_USB_CDC_COMPOSITE is not set
999# CONFIG_USB_G_MULTI is not set
962 1000
963# 1001#
964# OTG and related infrastructure 1002# OTG and related infrastructure
@@ -1248,7 +1286,11 @@ CONFIG_BDI_SWITCH=y
1248# CONFIG_KEYS is not set 1286# CONFIG_KEYS is not set
1249# CONFIG_SECURITY is not set 1287# CONFIG_SECURITY is not set
1250# CONFIG_SECURITYFS is not set 1288# CONFIG_SECURITYFS is not set
1251# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1289# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1290# CONFIG_DEFAULT_SECURITY_SMACK is not set
1291# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1292CONFIG_DEFAULT_SECURITY_DAC=y
1293CONFIG_DEFAULT_SECURITY=""
1252CONFIG_CRYPTO=y 1294CONFIG_CRYPTO=y
1253 1295
1254# 1296#
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index ef50ce45d50b..57ab5748a34d 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:18 2009 4# Wed Jan 6 09:24:12 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 38# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 39# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
40CONFIG_IRQ_PER_CPU=y 40CONFIG_IRQ_PER_CPU=y
41CONFIG_NR_IRQS=512
41CONFIG_STACKTRACE_SUPPORT=y 42CONFIG_STACKTRACE_SUPPORT=y
42CONFIG_HAVE_LATENCYTOP_SUPPORT=y 43CONFIG_HAVE_LATENCYTOP_SUPPORT=y
43CONFIG_TRACE_IRQFLAGS_SUPPORT=y 44CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -60,6 +61,7 @@ CONFIG_AUDIT_ARCH=y
60CONFIG_GENERIC_BUG=y 61CONFIG_GENERIC_BUG=y
61CONFIG_DTC=y 62CONFIG_DTC=y
62# CONFIG_DEFAULT_UIMAGE is not set 63# CONFIG_DEFAULT_UIMAGE is not set
64CONFIG_ARCH_HIBERNATION_POSSIBLE=y
63# CONFIG_PPC_DCR_NATIVE is not set 65# CONFIG_PPC_DCR_NATIVE is not set
64# CONFIG_PPC_DCR_MMIO is not set 66# CONFIG_PPC_DCR_MMIO is not set
65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 67CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -88,6 +90,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
88# 90#
89CONFIG_TREE_RCU=y 91CONFIG_TREE_RCU=y
90# CONFIG_TREE_PREEMPT_RCU is not set 92# CONFIG_TREE_PREEMPT_RCU is not set
93# CONFIG_TINY_RCU is not set
91# CONFIG_RCU_TRACE is not set 94# CONFIG_RCU_TRACE is not set
92CONFIG_RCU_FANOUT=32 95CONFIG_RCU_FANOUT=32
93# CONFIG_RCU_FANOUT_EXACT is not set 96# CONFIG_RCU_FANOUT_EXACT is not set
@@ -175,14 +178,41 @@ CONFIG_LBDAF=y
175# IO Schedulers 178# IO Schedulers
176# 179#
177CONFIG_IOSCHED_NOOP=y 180CONFIG_IOSCHED_NOOP=y
178CONFIG_IOSCHED_AS=y
179# CONFIG_IOSCHED_DEADLINE is not set 181# CONFIG_IOSCHED_DEADLINE is not set
180# CONFIG_IOSCHED_CFQ is not set 182# CONFIG_IOSCHED_CFQ is not set
181CONFIG_DEFAULT_AS=y
182# CONFIG_DEFAULT_DEADLINE is not set 183# CONFIG_DEFAULT_DEADLINE is not set
183# CONFIG_DEFAULT_CFQ is not set 184# CONFIG_DEFAULT_CFQ is not set
184# CONFIG_DEFAULT_NOOP is not set 185CONFIG_DEFAULT_NOOP=y
185CONFIG_DEFAULT_IOSCHED="anticipatory" 186CONFIG_DEFAULT_IOSCHED="noop"
187# CONFIG_INLINE_SPIN_TRYLOCK is not set
188# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
189# CONFIG_INLINE_SPIN_LOCK is not set
190# CONFIG_INLINE_SPIN_LOCK_BH is not set
191# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
192# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
193CONFIG_INLINE_SPIN_UNLOCK=y
194# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
195CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
196# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
197# CONFIG_INLINE_READ_TRYLOCK is not set
198# CONFIG_INLINE_READ_LOCK is not set
199# CONFIG_INLINE_READ_LOCK_BH is not set
200# CONFIG_INLINE_READ_LOCK_IRQ is not set
201# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
202CONFIG_INLINE_READ_UNLOCK=y
203# CONFIG_INLINE_READ_UNLOCK_BH is not set
204CONFIG_INLINE_READ_UNLOCK_IRQ=y
205# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
206# CONFIG_INLINE_WRITE_TRYLOCK is not set
207# CONFIG_INLINE_WRITE_LOCK is not set
208# CONFIG_INLINE_WRITE_LOCK_BH is not set
209# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
210# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
211CONFIG_INLINE_WRITE_UNLOCK=y
212# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
213CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
214# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
215# CONFIG_MUTEX_SPIN_ON_OWNER is not set
186# CONFIG_FREEZER is not set 216# CONFIG_FREEZER is not set
187 217
188# 218#
@@ -207,6 +237,8 @@ CONFIG_EMBEDDED6xx=y
207CONFIG_PPC_PRPMC2800=y 237CONFIG_PPC_PRPMC2800=y
208# CONFIG_PPC_C2K is not set 238# CONFIG_PPC_C2K is not set
209CONFIG_MV64X60=y 239CONFIG_MV64X60=y
240# CONFIG_GAMECUBE is not set
241# CONFIG_WII is not set
210# CONFIG_AMIGAONE is not set 242# CONFIG_AMIGAONE is not set
211CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 243CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
212# CONFIG_IPIC is not set 244# CONFIG_IPIC is not set
@@ -252,6 +284,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 284CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253# CONFIG_KEXEC is not set 285# CONFIG_KEXEC is not set
254# CONFIG_CRASH_DUMP is not set 286# CONFIG_CRASH_DUMP is not set
287CONFIG_SPARSE_IRQ=y
255CONFIG_MAX_ACTIVE_REGIONS=32 288CONFIG_MAX_ACTIVE_REGIONS=32
256CONFIG_ARCH_FLATMEM_ENABLE=y 289CONFIG_ARCH_FLATMEM_ENABLE=y
257CONFIG_ARCH_POPULATES_NODE_MAP=y 290CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -268,8 +301,6 @@ CONFIG_MIGRATION=y
268CONFIG_ZONE_DMA_FLAG=1 301CONFIG_ZONE_DMA_FLAG=1
269CONFIG_BOUNCE=y 302CONFIG_BOUNCE=y
270CONFIG_VIRT_TO_BUS=y 303CONFIG_VIRT_TO_BUS=y
271CONFIG_HAVE_MLOCK=y
272CONFIG_HAVE_MLOCKED_PAGE_BIT=y
273# CONFIG_KSM is not set 304# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 305CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275CONFIG_PPC_4K_PAGES=y 306CONFIG_PPC_4K_PAGES=y
@@ -394,9 +425,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_AF_RXRPC is not set 425# CONFIG_AF_RXRPC is not set
395CONFIG_WIRELESS=y 426CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 427# CONFIG_CFG80211 is not set
397CONFIG_CFG80211_DEFAULT_PS_VALUE=0
398CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set
400# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
401 429
402# 430#
@@ -518,6 +546,10 @@ CONFIG_BLK_DEV=y
518# CONFIG_BLK_DEV_COW_COMMON is not set 546# CONFIG_BLK_DEV_COW_COMMON is not set
519CONFIG_BLK_DEV_LOOP=y 547CONFIG_BLK_DEV_LOOP=y
520# CONFIG_BLK_DEV_CRYPTOLOOP is not set 548# CONFIG_BLK_DEV_CRYPTOLOOP is not set
549
550#
551# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
552#
521# CONFIG_BLK_DEV_NBD is not set 553# CONFIG_BLK_DEV_NBD is not set
522# CONFIG_BLK_DEV_SX8 is not set 554# CONFIG_BLK_DEV_SX8 is not set
523# CONFIG_BLK_DEV_UB is not set 555# CONFIG_BLK_DEV_UB is not set
@@ -529,6 +561,7 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
529# CONFIG_ATA_OVER_ETH is not set 561# CONFIG_ATA_OVER_ETH is not set
530# CONFIG_BLK_DEV_HD is not set 562# CONFIG_BLK_DEV_HD is not set
531CONFIG_MISC_DEVICES=y 563CONFIG_MISC_DEVICES=y
564# CONFIG_AD525X_DPOT is not set
532# CONFIG_PHANTOM is not set 565# CONFIG_PHANTOM is not set
533# CONFIG_SGI_IOC4 is not set 566# CONFIG_SGI_IOC4 is not set
534# CONFIG_TIFM_CORE is not set 567# CONFIG_TIFM_CORE is not set
@@ -536,6 +569,7 @@ CONFIG_MISC_DEVICES=y
536# CONFIG_ENCLOSURE_SERVICES is not set 569# CONFIG_ENCLOSURE_SERVICES is not set
537# CONFIG_HP_ILO is not set 570# CONFIG_HP_ILO is not set
538# CONFIG_ISL29003 is not set 571# CONFIG_ISL29003 is not set
572# CONFIG_DS1682 is not set
539# CONFIG_C2PORT is not set 573# CONFIG_C2PORT is not set
540 574
541# 575#
@@ -641,7 +675,9 @@ CONFIG_SCSI_LOWLEVEL=y
641# CONFIG_SCSI_BNX2_ISCSI is not set 675# CONFIG_SCSI_BNX2_ISCSI is not set
642# CONFIG_BE2ISCSI is not set 676# CONFIG_BE2ISCSI is not set
643# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 677# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
678# CONFIG_SCSI_HPSA is not set
644# CONFIG_SCSI_3W_9XXX is not set 679# CONFIG_SCSI_3W_9XXX is not set
680# CONFIG_SCSI_3W_SAS is not set
645# CONFIG_SCSI_ACARD is not set 681# CONFIG_SCSI_ACARD is not set
646# CONFIG_SCSI_AACRAID is not set 682# CONFIG_SCSI_AACRAID is not set
647# CONFIG_SCSI_AIC7XXX is not set 683# CONFIG_SCSI_AIC7XXX is not set
@@ -680,6 +716,7 @@ CONFIG_SCSI_LOWLEVEL=y
680# CONFIG_SCSI_NSP32 is not set 716# CONFIG_SCSI_NSP32 is not set
681# CONFIG_SCSI_DEBUG is not set 717# CONFIG_SCSI_DEBUG is not set
682# CONFIG_SCSI_PMCRAID is not set 718# CONFIG_SCSI_PMCRAID is not set
719# CONFIG_SCSI_PM8001 is not set
683# CONFIG_SCSI_SRP is not set 720# CONFIG_SCSI_SRP is not set
684# CONFIG_SCSI_BFA_FC is not set 721# CONFIG_SCSI_BFA_FC is not set
685# CONFIG_SCSI_DH is not set 722# CONFIG_SCSI_DH is not set
@@ -734,15 +771,16 @@ CONFIG_SATA_MV=y
734# CONFIG_PATA_NS87415 is not set 771# CONFIG_PATA_NS87415 is not set
735# CONFIG_PATA_OPTI is not set 772# CONFIG_PATA_OPTI is not set
736# CONFIG_PATA_OPTIDMA is not set 773# CONFIG_PATA_OPTIDMA is not set
774# CONFIG_PATA_PDC2027X is not set
737# CONFIG_PATA_PDC_OLD is not set 775# CONFIG_PATA_PDC_OLD is not set
738# CONFIG_PATA_RADISYS is not set 776# CONFIG_PATA_RADISYS is not set
739# CONFIG_PATA_RDC is not set 777# CONFIG_PATA_RDC is not set
740# CONFIG_PATA_RZ1000 is not set 778# CONFIG_PATA_RZ1000 is not set
741# CONFIG_PATA_SC1200 is not set 779# CONFIG_PATA_SC1200 is not set
742# CONFIG_PATA_SERVERWORKS is not set 780# CONFIG_PATA_SERVERWORKS is not set
743# CONFIG_PATA_PDC2027X is not set
744# CONFIG_PATA_SIL680 is not set 781# CONFIG_PATA_SIL680 is not set
745# CONFIG_PATA_SIS is not set 782# CONFIG_PATA_SIS is not set
783# CONFIG_PATA_TOSHIBA is not set
746# CONFIG_PATA_VIA is not set 784# CONFIG_PATA_VIA is not set
747# CONFIG_PATA_WINBOND is not set 785# CONFIG_PATA_WINBOND is not set
748# CONFIG_PATA_PLATFORM is not set 786# CONFIG_PATA_PLATFORM is not set
@@ -759,7 +797,7 @@ CONFIG_SATA_MV=y
759# 797#
760 798
761# 799#
762# See the help texts for more information. 800# The newer stack is recommended.
763# 801#
764# CONFIG_FIREWIRE is not set 802# CONFIG_FIREWIRE is not set
765# CONFIG_IEEE1394 is not set 803# CONFIG_IEEE1394 is not set
@@ -886,8 +924,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y
886# CONFIG_BE2NET is not set 924# CONFIG_BE2NET is not set
887# CONFIG_TR is not set 925# CONFIG_TR is not set
888CONFIG_WLAN=y 926CONFIG_WLAN=y
889# CONFIG_WLAN_PRE80211 is not set 927# CONFIG_AIRO is not set
890# CONFIG_WLAN_80211 is not set 928# CONFIG_ATMEL is not set
929# CONFIG_PRISM54 is not set
930# CONFIG_USB_ZD1201 is not set
931# CONFIG_HOSTAP is not set
891 932
892# 933#
893# Enable WiMAX (Networking options) to see the WiMAX drivers 934# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -910,6 +951,7 @@ CONFIG_WLAN=y
910# CONFIG_NETCONSOLE is not set 951# CONFIG_NETCONSOLE is not set
911# CONFIG_NETPOLL is not set 952# CONFIG_NETPOLL is not set
912# CONFIG_NET_POLL_CONTROLLER is not set 953# CONFIG_NET_POLL_CONTROLLER is not set
954# CONFIG_VMXNET3 is not set
913# CONFIG_ISDN is not set 955# CONFIG_ISDN is not set
914# CONFIG_PHONE is not set 956# CONFIG_PHONE is not set
915 957
@@ -919,6 +961,7 @@ CONFIG_WLAN=y
919CONFIG_INPUT=y 961CONFIG_INPUT=y
920CONFIG_INPUT_FF_MEMLESS=y 962CONFIG_INPUT_FF_MEMLESS=y
921# CONFIG_INPUT_POLLDEV is not set 963# CONFIG_INPUT_POLLDEV is not set
964# CONFIG_INPUT_SPARSEKMAP is not set
922 965
923# 966#
924# Userland interfaces 967# Userland interfaces
@@ -973,6 +1016,7 @@ CONFIG_SERIAL_MPSC_CONSOLE=y
973CONFIG_SERIAL_CORE=y 1016CONFIG_SERIAL_CORE=y
974CONFIG_SERIAL_CORE_CONSOLE=y 1017CONFIG_SERIAL_CORE_CONSOLE=y
975# CONFIG_SERIAL_JSM is not set 1018# CONFIG_SERIAL_JSM is not set
1019# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
976CONFIG_UNIX98_PTYS=y 1020CONFIG_UNIX98_PTYS=y
977# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1021# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
978CONFIG_LEGACY_PTYS=y 1022CONFIG_LEGACY_PTYS=y
@@ -1030,11 +1074,6 @@ CONFIG_I2C_MV64XXX=y
1030# CONFIG_I2C_TINY_USB is not set 1074# CONFIG_I2C_TINY_USB is not set
1031 1075
1032# 1076#
1033# Graphics adapter I2C/DDC channel drivers
1034#
1035# CONFIG_I2C_VOODOO3 is not set
1036
1037#
1038# Other I2C/SMBus bus drivers 1077# Other I2C/SMBus bus drivers
1039# 1078#
1040# CONFIG_I2C_PCA_PLATFORM is not set 1079# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1042,7 +1081,6 @@ CONFIG_I2C_MV64XXX=y
1042# 1081#
1043# Miscellaneous I2C Chip support 1082# Miscellaneous I2C Chip support
1044# 1083#
1045# CONFIG_DS1682 is not set
1046# CONFIG_SENSORS_TSL2550 is not set 1084# CONFIG_SENSORS_TSL2550 is not set
1047# CONFIG_I2C_DEBUG_CORE is not set 1085# CONFIG_I2C_DEBUG_CORE is not set
1048# CONFIG_I2C_DEBUG_ALGO is not set 1086# CONFIG_I2C_DEBUG_ALGO is not set
@@ -1088,6 +1126,7 @@ CONFIG_HWMON=y
1088# CONFIG_SENSORS_GL520SM is not set 1126# CONFIG_SENSORS_GL520SM is not set
1089# CONFIG_SENSORS_IT87 is not set 1127# CONFIG_SENSORS_IT87 is not set
1090# CONFIG_SENSORS_LM63 is not set 1128# CONFIG_SENSORS_LM63 is not set
1129# CONFIG_SENSORS_LM73 is not set
1091# CONFIG_SENSORS_LM75 is not set 1130# CONFIG_SENSORS_LM75 is not set
1092# CONFIG_SENSORS_LM77 is not set 1131# CONFIG_SENSORS_LM77 is not set
1093# CONFIG_SENSORS_LM78 is not set 1132# CONFIG_SENSORS_LM78 is not set
@@ -1126,6 +1165,7 @@ CONFIG_HWMON=y
1126# CONFIG_SENSORS_W83L786NG is not set 1165# CONFIG_SENSORS_W83L786NG is not set
1127# CONFIG_SENSORS_W83627HF is not set 1166# CONFIG_SENSORS_W83627HF is not set
1128# CONFIG_SENSORS_W83627EHF is not set 1167# CONFIG_SENSORS_W83627EHF is not set
1168# CONFIG_SENSORS_LIS3_I2C is not set
1129# CONFIG_THERMAL is not set 1169# CONFIG_THERMAL is not set
1130# CONFIG_WATCHDOG is not set 1170# CONFIG_WATCHDOG is not set
1131CONFIG_SSB_POSSIBLE=y 1171CONFIG_SSB_POSSIBLE=y
@@ -1144,11 +1184,13 @@ CONFIG_SSB_POSSIBLE=y
1144# CONFIG_TWL4030_CORE is not set 1184# CONFIG_TWL4030_CORE is not set
1145# CONFIG_MFD_TMIO is not set 1185# CONFIG_MFD_TMIO is not set
1146# CONFIG_PMIC_DA903X is not set 1186# CONFIG_PMIC_DA903X is not set
1187# CONFIG_PMIC_ADP5520 is not set
1147# CONFIG_MFD_WM8400 is not set 1188# CONFIG_MFD_WM8400 is not set
1148# CONFIG_MFD_WM831X is not set 1189# CONFIG_MFD_WM831X is not set
1149# CONFIG_MFD_WM8350_I2C is not set 1190# CONFIG_MFD_WM8350_I2C is not set
1150# CONFIG_MFD_PCF50633 is not set 1191# CONFIG_MFD_PCF50633 is not set
1151# CONFIG_AB3100_CORE is not set 1192# CONFIG_AB3100_CORE is not set
1193# CONFIG_MFD_88PM8607 is not set
1152# CONFIG_REGULATOR is not set 1194# CONFIG_REGULATOR is not set
1153# CONFIG_MEDIA_SUPPORT is not set 1195# CONFIG_MEDIA_SUPPORT is not set
1154 1196
@@ -1250,6 +1292,7 @@ CONFIG_USB_MON=y
1250CONFIG_USB_EHCI_HCD=y 1292CONFIG_USB_EHCI_HCD=y
1251# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1293# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1252# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1294# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1295# CONFIG_XPS_USB_HCD_XILINX is not set
1253CONFIG_USB_EHCI_HCD_PPC_OF=y 1296CONFIG_USB_EHCI_HCD_PPC_OF=y
1254# CONFIG_USB_OXU210HP_HCD is not set 1297# CONFIG_USB_OXU210HP_HCD is not set
1255# CONFIG_USB_ISP116X_HCD is not set 1298# CONFIG_USB_ISP116X_HCD is not set
@@ -1362,6 +1405,7 @@ CONFIG_RTC_DRV_MAX6900=y
1362# CONFIG_RTC_DRV_PCF8563 is not set 1405# CONFIG_RTC_DRV_PCF8563 is not set
1363# CONFIG_RTC_DRV_PCF8583 is not set 1406# CONFIG_RTC_DRV_PCF8583 is not set
1364# CONFIG_RTC_DRV_M41T80 is not set 1407# CONFIG_RTC_DRV_M41T80 is not set
1408# CONFIG_RTC_DRV_BQ32K is not set
1365# CONFIG_RTC_DRV_S35390A is not set 1409# CONFIG_RTC_DRV_S35390A is not set
1366# CONFIG_RTC_DRV_FM3130 is not set 1410# CONFIG_RTC_DRV_FM3130 is not set
1367# CONFIG_RTC_DRV_RX8581 is not set 1411# CONFIG_RTC_DRV_RX8581 is not set
@@ -1383,7 +1427,9 @@ CONFIG_RTC_DRV_MAX6900=y
1383# CONFIG_RTC_DRV_M48T86 is not set 1427# CONFIG_RTC_DRV_M48T86 is not set
1384# CONFIG_RTC_DRV_M48T35 is not set 1428# CONFIG_RTC_DRV_M48T35 is not set
1385# CONFIG_RTC_DRV_M48T59 is not set 1429# CONFIG_RTC_DRV_M48T59 is not set
1430# CONFIG_RTC_DRV_MSM6242 is not set
1386# CONFIG_RTC_DRV_BQ4802 is not set 1431# CONFIG_RTC_DRV_BQ4802 is not set
1432# CONFIG_RTC_DRV_RP5C01 is not set
1387# CONFIG_RTC_DRV_V3020 is not set 1433# CONFIG_RTC_DRV_V3020 is not set
1388 1434
1389# 1435#
@@ -1626,7 +1672,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1626# CONFIG_KEYS is not set 1672# CONFIG_KEYS is not set
1627# CONFIG_SECURITY is not set 1673# CONFIG_SECURITY is not set
1628# CONFIG_SECURITYFS is not set 1674# CONFIG_SECURITYFS is not set
1629# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1675# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1676# CONFIG_DEFAULT_SECURITY_SMACK is not set
1677# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1678CONFIG_DEFAULT_SECURITY_DAC=y
1679CONFIG_DEFAULT_SECURITY=""
1630CONFIG_CRYPTO=y 1680CONFIG_CRYPTO=y
1631 1681
1632# 1682#
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index 524263158fc0..f2f832161463 100644
--- a/arch/powerpc/configs/storcenter_defconfig
+++ b/arch/powerpc/configs/storcenter_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc5 3# Linux kernel version: 2.6.33-rc3
4# Thu Nov 5 08:20:19 2009 4# Wed Jan 6 09:24:13 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 36# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set 37# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
38CONFIG_IRQ_PER_CPU=y 38CONFIG_IRQ_PER_CPU=y
39CONFIG_NR_IRQS=512
39CONFIG_STACKTRACE_SUPPORT=y 40CONFIG_STACKTRACE_SUPPORT=y
40CONFIG_HAVE_LATENCYTOP_SUPPORT=y 41CONFIG_HAVE_LATENCYTOP_SUPPORT=y
41CONFIG_TRACE_IRQFLAGS_SUPPORT=y 42CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
58CONFIG_GENERIC_BUG=y 59CONFIG_GENERIC_BUG=y
59CONFIG_DTC=y 60CONFIG_DTC=y
60# CONFIG_DEFAULT_UIMAGE is not set 61# CONFIG_DEFAULT_UIMAGE is not set
62CONFIG_ARCH_HIBERNATION_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 63# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 64# CONFIG_PPC_DCR_MMIO is not set
63CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y 65CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
85# 87#
86CONFIG_TREE_RCU=y 88CONFIG_TREE_RCU=y
87# CONFIG_TREE_PREEMPT_RCU is not set 89# CONFIG_TREE_PREEMPT_RCU is not set
90# CONFIG_TINY_RCU is not set
88# CONFIG_RCU_TRACE is not set 91# CONFIG_RCU_TRACE is not set
89CONFIG_RCU_FANOUT=32 92CONFIG_RCU_FANOUT=32
90# CONFIG_RCU_FANOUT_EXACT is not set 93# CONFIG_RCU_FANOUT_EXACT is not set
@@ -167,14 +170,41 @@ CONFIG_LBDAF=y
167# IO Schedulers 170# IO Schedulers
168# 171#
169CONFIG_IOSCHED_NOOP=y 172CONFIG_IOSCHED_NOOP=y
170CONFIG_IOSCHED_AS=y
171CONFIG_IOSCHED_DEADLINE=y 173CONFIG_IOSCHED_DEADLINE=y
172CONFIG_IOSCHED_CFQ=y 174CONFIG_IOSCHED_CFQ=y
173# CONFIG_DEFAULT_AS is not set
174# CONFIG_DEFAULT_DEADLINE is not set 175# CONFIG_DEFAULT_DEADLINE is not set
175CONFIG_DEFAULT_CFQ=y 176CONFIG_DEFAULT_CFQ=y
176# CONFIG_DEFAULT_NOOP is not set 177# CONFIG_DEFAULT_NOOP is not set
177CONFIG_DEFAULT_IOSCHED="cfq" 178CONFIG_DEFAULT_IOSCHED="cfq"
179# CONFIG_INLINE_SPIN_TRYLOCK is not set
180# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
181# CONFIG_INLINE_SPIN_LOCK is not set
182# CONFIG_INLINE_SPIN_LOCK_BH is not set
183# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
184# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
185CONFIG_INLINE_SPIN_UNLOCK=y
186# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
187CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
188# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
189# CONFIG_INLINE_READ_TRYLOCK is not set
190# CONFIG_INLINE_READ_LOCK is not set
191# CONFIG_INLINE_READ_LOCK_BH is not set
192# CONFIG_INLINE_READ_LOCK_IRQ is not set
193# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
194CONFIG_INLINE_READ_UNLOCK=y
195# CONFIG_INLINE_READ_UNLOCK_BH is not set
196CONFIG_INLINE_READ_UNLOCK_IRQ=y
197# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
198# CONFIG_INLINE_WRITE_TRYLOCK is not set
199# CONFIG_INLINE_WRITE_LOCK is not set
200# CONFIG_INLINE_WRITE_LOCK_BH is not set
201# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
202# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
203CONFIG_INLINE_WRITE_UNLOCK=y
204# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
205CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
206# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
207# CONFIG_MUTEX_SPIN_ON_OWNER is not set
178# CONFIG_FREEZER is not set 208# CONFIG_FREEZER is not set
179 209
180# 210#
@@ -201,6 +231,8 @@ CONFIG_STORCENTER=y
201CONFIG_MPC10X_BRIDGE=y 231CONFIG_MPC10X_BRIDGE=y
202CONFIG_MPC10X_OPENPIC=y 232CONFIG_MPC10X_OPENPIC=y
203# CONFIG_MPC10X_STORE_GATHERING is not set 233# CONFIG_MPC10X_STORE_GATHERING is not set
234# CONFIG_GAMECUBE is not set
235# CONFIG_WII is not set
204# CONFIG_AMIGAONE is not set 236# CONFIG_AMIGAONE is not set
205CONFIG_PPC_OF_BOOT_TRAMPOLINE=y 237CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
206# CONFIG_IPIC is not set 238# CONFIG_IPIC is not set
@@ -246,6 +278,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 278CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
247# CONFIG_KEXEC is not set 279# CONFIG_KEXEC is not set
248# CONFIG_CRASH_DUMP is not set 280# CONFIG_CRASH_DUMP is not set
281CONFIG_SPARSE_IRQ=y
249CONFIG_MAX_ACTIVE_REGIONS=32 282CONFIG_MAX_ACTIVE_REGIONS=32
250CONFIG_ARCH_FLATMEM_ENABLE=y 283CONFIG_ARCH_FLATMEM_ENABLE=y
251CONFIG_ARCH_POPULATES_NODE_MAP=y 284CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -262,8 +295,6 @@ CONFIG_MIGRATION=y
262CONFIG_ZONE_DMA_FLAG=1 295CONFIG_ZONE_DMA_FLAG=1
263CONFIG_BOUNCE=y 296CONFIG_BOUNCE=y
264CONFIG_VIRT_TO_BUS=y 297CONFIG_VIRT_TO_BUS=y
265CONFIG_HAVE_MLOCK=y
266CONFIG_HAVE_MLOCKED_PAGE_BIT=y
267# CONFIG_KSM is not set 298# CONFIG_KSM is not set
268CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 299CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
269CONFIG_PPC_4K_PAGES=y 300CONFIG_PPC_4K_PAGES=y
@@ -384,9 +415,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
385CONFIG_WIRELESS=y 416CONFIG_WIRELESS=y
386# CONFIG_CFG80211 is not set 417# CONFIG_CFG80211 is not set
387CONFIG_CFG80211_DEFAULT_PS_VALUE=0
388CONFIG_WIRELESS_OLD_REGULATORY=y
389# CONFIG_WIRELESS_EXT is not set
390# CONFIG_LIB80211 is not set 418# CONFIG_LIB80211 is not set
391 419
392# 420#
@@ -507,6 +535,10 @@ CONFIG_BLK_DEV=y
507# CONFIG_BLK_DEV_UMEM is not set 535# CONFIG_BLK_DEV_UMEM is not set
508# CONFIG_BLK_DEV_COW_COMMON is not set 536# CONFIG_BLK_DEV_COW_COMMON is not set
509# CONFIG_BLK_DEV_LOOP is not set 537# CONFIG_BLK_DEV_LOOP is not set
538
539#
540# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
541#
510# CONFIG_BLK_DEV_NBD is not set 542# CONFIG_BLK_DEV_NBD is not set
511# CONFIG_BLK_DEV_SX8 is not set 543# CONFIG_BLK_DEV_SX8 is not set
512# CONFIG_BLK_DEV_UB is not set 544# CONFIG_BLK_DEV_UB is not set
@@ -515,6 +547,7 @@ CONFIG_BLK_DEV=y
515# CONFIG_ATA_OVER_ETH is not set 547# CONFIG_ATA_OVER_ETH is not set
516# CONFIG_BLK_DEV_HD is not set 548# CONFIG_BLK_DEV_HD is not set
517CONFIG_MISC_DEVICES=y 549CONFIG_MISC_DEVICES=y
550# CONFIG_AD525X_DPOT is not set
518# CONFIG_PHANTOM is not set 551# CONFIG_PHANTOM is not set
519# CONFIG_SGI_IOC4 is not set 552# CONFIG_SGI_IOC4 is not set
520# CONFIG_TIFM_CORE is not set 553# CONFIG_TIFM_CORE is not set
@@ -522,6 +555,7 @@ CONFIG_MISC_DEVICES=y
522# CONFIG_ENCLOSURE_SERVICES is not set 555# CONFIG_ENCLOSURE_SERVICES is not set
523# CONFIG_HP_ILO is not set 556# CONFIG_HP_ILO is not set
524# CONFIG_ISL29003 is not set 557# CONFIG_ISL29003 is not set
558# CONFIG_DS1682 is not set
525# CONFIG_C2PORT is not set 559# CONFIG_C2PORT is not set
526 560
527# 561#
@@ -628,7 +662,9 @@ CONFIG_SCSI_LOWLEVEL=y
628# CONFIG_SCSI_BNX2_ISCSI is not set 662# CONFIG_SCSI_BNX2_ISCSI is not set
629# CONFIG_BE2ISCSI is not set 663# CONFIG_BE2ISCSI is not set
630# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 664# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
665# CONFIG_SCSI_HPSA is not set
631# CONFIG_SCSI_3W_9XXX is not set 666# CONFIG_SCSI_3W_9XXX is not set
667# CONFIG_SCSI_3W_SAS is not set
632# CONFIG_SCSI_ACARD is not set 668# CONFIG_SCSI_ACARD is not set
633# CONFIG_SCSI_AACRAID is not set 669# CONFIG_SCSI_AACRAID is not set
634# CONFIG_SCSI_AIC7XXX is not set 670# CONFIG_SCSI_AIC7XXX is not set
@@ -666,6 +702,7 @@ CONFIG_SCSI_LOWLEVEL=y
666# CONFIG_SCSI_NSP32 is not set 702# CONFIG_SCSI_NSP32 is not set
667# CONFIG_SCSI_DEBUG is not set 703# CONFIG_SCSI_DEBUG is not set
668# CONFIG_SCSI_PMCRAID is not set 704# CONFIG_SCSI_PMCRAID is not set
705# CONFIG_SCSI_PM8001 is not set
669# CONFIG_SCSI_SRP is not set 706# CONFIG_SCSI_SRP is not set
670# CONFIG_SCSI_BFA_FC is not set 707# CONFIG_SCSI_BFA_FC is not set
671# CONFIG_SCSI_DH is not set 708# CONFIG_SCSI_DH is not set
@@ -695,7 +732,7 @@ CONFIG_MD_RAID6_PQ=y
695# 732#
696 733
697# 734#
698# See the help texts for more information. 735# The newer stack is recommended.
699# 736#
700# CONFIG_FIREWIRE is not set 737# CONFIG_FIREWIRE is not set
701# CONFIG_IEEE1394 is not set 738# CONFIG_IEEE1394 is not set
@@ -741,8 +778,11 @@ CONFIG_R8169=y
741# CONFIG_NETDEV_10000 is not set 778# CONFIG_NETDEV_10000 is not set
742# CONFIG_TR is not set 779# CONFIG_TR is not set
743CONFIG_WLAN=y 780CONFIG_WLAN=y
744# CONFIG_WLAN_PRE80211 is not set 781# CONFIG_AIRO is not set
745# CONFIG_WLAN_80211 is not set 782# CONFIG_ATMEL is not set
783# CONFIG_PRISM54 is not set
784# CONFIG_USB_ZD1201 is not set
785# CONFIG_HOSTAP is not set
746 786
747# 787#
748# Enable WiMAX (Networking options) to see the WiMAX drivers 788# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -765,6 +805,7 @@ CONFIG_WLAN=y
765# CONFIG_NETCONSOLE is not set 805# CONFIG_NETCONSOLE is not set
766# CONFIG_NETPOLL is not set 806# CONFIG_NETPOLL is not set
767# CONFIG_NET_POLL_CONTROLLER is not set 807# CONFIG_NET_POLL_CONTROLLER is not set
808# CONFIG_VMXNET3 is not set
768# CONFIG_ISDN is not set 809# CONFIG_ISDN is not set
769# CONFIG_PHONE is not set 810# CONFIG_PHONE is not set
770 811
@@ -805,6 +846,7 @@ CONFIG_SERIAL_CORE=y
805CONFIG_SERIAL_CORE_CONSOLE=y 846CONFIG_SERIAL_CORE_CONSOLE=y
806# CONFIG_SERIAL_JSM is not set 847# CONFIG_SERIAL_JSM is not set
807# CONFIG_SERIAL_OF_PLATFORM is not set 848# CONFIG_SERIAL_OF_PLATFORM is not set
849# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
808CONFIG_UNIX98_PTYS=y 850CONFIG_UNIX98_PTYS=y
809# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 851# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
810CONFIG_LEGACY_PTYS=y 852CONFIG_LEGACY_PTYS=y
@@ -862,11 +904,6 @@ CONFIG_I2C_MPC=y
862# CONFIG_I2C_TINY_USB is not set 904# CONFIG_I2C_TINY_USB is not set
863 905
864# 906#
865# Graphics adapter I2C/DDC channel drivers
866#
867# CONFIG_I2C_VOODOO3 is not set
868
869#
870# Other I2C/SMBus bus drivers 907# Other I2C/SMBus bus drivers
871# 908#
872# CONFIG_I2C_PCA_PLATFORM is not set 909# CONFIG_I2C_PCA_PLATFORM is not set
@@ -875,7 +912,6 @@ CONFIG_I2C_MPC=y
875# 912#
876# Miscellaneous I2C Chip support 913# Miscellaneous I2C Chip support
877# 914#
878# CONFIG_DS1682 is not set
879# CONFIG_SENSORS_TSL2550 is not set 915# CONFIG_SENSORS_TSL2550 is not set
880# CONFIG_I2C_DEBUG_CORE is not set 916# CONFIG_I2C_DEBUG_CORE is not set
881# CONFIG_I2C_DEBUG_ALGO is not set 917# CONFIG_I2C_DEBUG_ALGO is not set
@@ -910,11 +946,13 @@ CONFIG_SSB_POSSIBLE=y
910# CONFIG_TWL4030_CORE is not set 946# CONFIG_TWL4030_CORE is not set
911# CONFIG_MFD_TMIO is not set 947# CONFIG_MFD_TMIO is not set
912# CONFIG_PMIC_DA903X is not set 948# CONFIG_PMIC_DA903X is not set
949# CONFIG_PMIC_ADP5520 is not set
913# CONFIG_MFD_WM8400 is not set 950# CONFIG_MFD_WM8400 is not set
914# CONFIG_MFD_WM831X is not set 951# CONFIG_MFD_WM831X is not set
915# CONFIG_MFD_WM8350_I2C is not set 952# CONFIG_MFD_WM8350_I2C is not set
916# CONFIG_MFD_PCF50633 is not set 953# CONFIG_MFD_PCF50633 is not set
917# CONFIG_AB3100_CORE is not set 954# CONFIG_AB3100_CORE is not set
955# CONFIG_MFD_88PM8607 is not set
918# CONFIG_REGULATOR is not set 956# CONFIG_REGULATOR is not set
919# CONFIG_MEDIA_SUPPORT is not set 957# CONFIG_MEDIA_SUPPORT is not set
920 958
@@ -963,6 +1001,7 @@ CONFIG_USB_DEVICE_CLASS=y
963CONFIG_USB_EHCI_HCD=y 1001CONFIG_USB_EHCI_HCD=y
964# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1002# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
965# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1003# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1004# CONFIG_XPS_USB_HCD_XILINX is not set
966# CONFIG_USB_EHCI_FSL is not set 1005# CONFIG_USB_EHCI_FSL is not set
967CONFIG_USB_EHCI_HCD_PPC_OF=y 1006CONFIG_USB_EHCI_HCD_PPC_OF=y
968# CONFIG_USB_OXU210HP_HCD is not set 1007# CONFIG_USB_OXU210HP_HCD is not set
@@ -1087,6 +1126,7 @@ CONFIG_RTC_DRV_DS1307=y
1087# CONFIG_RTC_DRV_PCF8563 is not set 1126# CONFIG_RTC_DRV_PCF8563 is not set
1088# CONFIG_RTC_DRV_PCF8583 is not set 1127# CONFIG_RTC_DRV_PCF8583 is not set
1089# CONFIG_RTC_DRV_M41T80 is not set 1128# CONFIG_RTC_DRV_M41T80 is not set
1129# CONFIG_RTC_DRV_BQ32K is not set
1090# CONFIG_RTC_DRV_S35390A is not set 1130# CONFIG_RTC_DRV_S35390A is not set
1091# CONFIG_RTC_DRV_FM3130 is not set 1131# CONFIG_RTC_DRV_FM3130 is not set
1092# CONFIG_RTC_DRV_RX8581 is not set 1132# CONFIG_RTC_DRV_RX8581 is not set
@@ -1108,7 +1148,9 @@ CONFIG_RTC_DRV_DS1307=y
1108# CONFIG_RTC_DRV_M48T86 is not set 1148# CONFIG_RTC_DRV_M48T86 is not set
1109# CONFIG_RTC_DRV_M48T35 is not set 1149# CONFIG_RTC_DRV_M48T35 is not set
1110# CONFIG_RTC_DRV_M48T59 is not set 1150# CONFIG_RTC_DRV_M48T59 is not set
1151# CONFIG_RTC_DRV_MSM6242 is not set
1111# CONFIG_RTC_DRV_BQ4802 is not set 1152# CONFIG_RTC_DRV_BQ4802 is not set
1153# CONFIG_RTC_DRV_RP5C01 is not set
1112# CONFIG_RTC_DRV_V3020 is not set 1154# CONFIG_RTC_DRV_V3020 is not set
1113 1155
1114# 1156#
@@ -1322,7 +1364,7 @@ CONFIG_FRAME_WARN=1024
1322# CONFIG_DEBUG_KERNEL is not set 1364# CONFIG_DEBUG_KERNEL is not set
1323# CONFIG_SLUB_DEBUG_ON is not set 1365# CONFIG_SLUB_DEBUG_ON is not set
1324# CONFIG_SLUB_STATS is not set 1366# CONFIG_SLUB_STATS is not set
1325# CONFIG_DEBUG_BUGVERBOSE is not set 1367CONFIG_DEBUG_BUGVERBOSE=y
1326# CONFIG_DEBUG_MEMORY_INIT is not set 1368# CONFIG_DEBUG_MEMORY_INIT is not set
1327# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1369# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1328# CONFIG_LATENCYTOP is not set 1370# CONFIG_LATENCYTOP is not set
@@ -1349,7 +1391,11 @@ CONFIG_PRINT_STACK_DEPTH=64
1349# CONFIG_KEYS is not set 1391# CONFIG_KEYS is not set
1350# CONFIG_SECURITY is not set 1392# CONFIG_SECURITY is not set
1351# CONFIG_SECURITYFS is not set 1393# CONFIG_SECURITYFS is not set
1352# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1394# CONFIG_DEFAULT_SECURITY_SELINUX is not set
1395# CONFIG_DEFAULT_SECURITY_SMACK is not set
1396# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
1397CONFIG_DEFAULT_SECURITY_DAC=y
1398CONFIG_DEFAULT_SECURITY=""
1353CONFIG_XOR_BLOCKS=y 1399CONFIG_XOR_BLOCKS=y
1354CONFIG_ASYNC_CORE=y 1400CONFIG_ASYNC_CORE=y
1355CONFIG_ASYNC_MEMCPY=y 1401CONFIG_ASYNC_MEMCPY=y
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index 22f738d12ad9..bbf89701d7a4 100644
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -17,7 +17,9 @@ static inline int cpu_to_node(int cpu)
17 17
18#define parent_node(node) (node) 18#define parent_node(node) (node)
19 19
20#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node]) 20#define cpumask_of_node(node) ((node) == -1 ? \
21 cpu_all_mask : \
22 &numa_cpumask_lookup_table[node])
21 23
22int of_node_to_nid(struct device_node *device); 24int of_node_to_nid(struct device_node *device);
23 25
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 678f98cd5e64..3ef743fa5d7c 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -542,11 +542,11 @@ DARFixed:/* Return from dcbx instruction bug workaround, r10 holds value of DAR
542FixupDAR:/* Entry point for dcbx workaround. */ 542FixupDAR:/* Entry point for dcbx workaround. */
543 /* fetch instruction from memory. */ 543 /* fetch instruction from memory. */
544 mfspr r10, SPRN_SRR0 544 mfspr r10, SPRN_SRR0
545 andis. r11, r10, 0x8000 /* Address >= 0x80000000 */
545 DO_8xx_CPU6(0x3780, r3) 546 DO_8xx_CPU6(0x3780, r3)
546 mtspr SPRN_MD_EPN, r10 547 mtspr SPRN_MD_EPN, r10
547 mfspr r11, SPRN_M_TWB /* Get level 1 table entry address */ 548 mfspr r11, SPRN_M_TWB /* Get level 1 table entry address */
548 cmplwi cr0, r11, 0x0800 549 beq- 3f /* Branch if user space */
549 blt- 3f /* Branch if user space */
550 lis r11, (swapper_pg_dir-PAGE_OFFSET)@h 550 lis r11, (swapper_pg_dir-PAGE_OFFSET)@h
551 ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l 551 ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l
552 rlwimi r11, r10, 32-20, 0xffc /* r11 = r11&~0xffc|(r10>>20)&0xffc */ 552 rlwimi r11, r10, 32-20, 0xffc /* r11 = r11&~0xffc|(r10>>20)&0xffc */
@@ -768,12 +768,12 @@ start_here:
768 */ 768 */
769initial_mmu: 769initial_mmu:
770 tlbia /* Invalidate all TLB entries */ 770 tlbia /* Invalidate all TLB entries */
771#ifdef CONFIG_PIN_TLB 771/* Always pin the first 8 MB ITLB to prevent ITLB
772 misses while mucking around with SRR0/SRR1 in asm
773*/
772 lis r8, MI_RSV4I@h 774 lis r8, MI_RSV4I@h
773 ori r8, r8, 0x1c00 775 ori r8, r8, 0x1c00
774#else 776
775 li r8, 0
776#endif
777 mtspr SPRN_MI_CTR, r8 /* Set instruction MMU control */ 777 mtspr SPRN_MI_CTR, r8 /* Set instruction MMU control */
778 778
779#ifdef CONFIG_PIN_TLB 779#ifdef CONFIG_PIN_TLB
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index e8dfdbd9327a..cadbed679fbb 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1107,6 +1107,12 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)
1107 list_for_each_entry(dev, &bus->devices, bus_list) { 1107 list_for_each_entry(dev, &bus->devices, bus_list) {
1108 struct dev_archdata *sd = &dev->dev.archdata; 1108 struct dev_archdata *sd = &dev->dev.archdata;
1109 1109
1110 /* Cardbus can call us to add new devices to a bus, so ignore
1111 * those who are already fully discovered
1112 */
1113 if (dev->is_added)
1114 continue;
1115
1110 /* Setup OF node pointer in archdata */ 1116 /* Setup OF node pointer in archdata */
1111 sd->of_node = pci_device_to_OF_node(dev); 1117 sd->of_node = pci_device_to_OF_node(dev);
1112 1118
@@ -1147,6 +1153,13 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
1147} 1153}
1148EXPORT_SYMBOL(pcibios_fixup_bus); 1154EXPORT_SYMBOL(pcibios_fixup_bus);
1149 1155
1156void __devinit pci_fixup_cardbus(struct pci_bus *bus)
1157{
1158 /* Now fixup devices on that bus */
1159 pcibios_setup_bus_devices(bus);
1160}
1161
1162
1150static int skip_isa_ioresource_align(struct pci_dev *dev) 1163static int skip_isa_ioresource_align(struct pci_dev *dev)
1151{ 1164{
1152 if ((ppc_pci_flags & PPC_PCI_CAN_SKIP_ISA_ALIGN) && 1165 if ((ppc_pci_flags & PPC_PCI_CAN_SKIP_ISA_ALIGN) &&
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index 1be9fe38bcb5..8777fb02349f 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -262,19 +262,19 @@ static int __init proc_rtas_init(void)
262 if (rtas_node == NULL) 262 if (rtas_node == NULL)
263 return -ENODEV; 263 return -ENODEV;
264 264
265 proc_create("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL, 265 proc_create("powerpc/rtas/progress", S_IRUGO|S_IWUSR, NULL,
266 &ppc_rtas_progress_operations); 266 &ppc_rtas_progress_operations);
267 proc_create("ppc64/rtas/clock", S_IRUGO|S_IWUSR, NULL, 267 proc_create("powerpc/rtas/clock", S_IRUGO|S_IWUSR, NULL,
268 &ppc_rtas_clock_operations); 268 &ppc_rtas_clock_operations);
269 proc_create("ppc64/rtas/poweron", S_IWUSR|S_IRUGO, NULL, 269 proc_create("powerpc/rtas/poweron", S_IWUSR|S_IRUGO, NULL,
270 &ppc_rtas_poweron_operations); 270 &ppc_rtas_poweron_operations);
271 proc_create("ppc64/rtas/sensors", S_IRUGO, NULL, 271 proc_create("powerpc/rtas/sensors", S_IRUGO, NULL,
272 &ppc_rtas_sensors_operations); 272 &ppc_rtas_sensors_operations);
273 proc_create("ppc64/rtas/frequency", S_IWUSR|S_IRUGO, NULL, 273 proc_create("powerpc/rtas/frequency", S_IWUSR|S_IRUGO, NULL,
274 &ppc_rtas_tone_freq_operations); 274 &ppc_rtas_tone_freq_operations);
275 proc_create("ppc64/rtas/volume", S_IWUSR|S_IRUGO, NULL, 275 proc_create("powerpc/rtas/volume", S_IWUSR|S_IRUGO, NULL,
276 &ppc_rtas_tone_volume_operations); 276 &ppc_rtas_tone_volume_operations);
277 proc_create("ppc64/rtas/rmo_buffer", S_IRUSR, NULL, 277 proc_create("powerpc/rtas/rmo_buffer", S_IRUSR, NULL,
278 &ppc_rtas_rmo_buf_ops); 278 &ppc_rtas_rmo_buf_ops);
279 return 0; 279 return 0;
280} 280}
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index a521fb8a40ee..c2ee14498077 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -619,4 +619,16 @@ void __cpu_die(unsigned int cpu)
619 if (smp_ops->cpu_die) 619 if (smp_ops->cpu_die)
620 smp_ops->cpu_die(cpu); 620 smp_ops->cpu_die(cpu);
621} 621}
622
623static DEFINE_MUTEX(powerpc_cpu_hotplug_driver_mutex);
624
625void cpu_hotplug_driver_lock()
626{
627 mutex_lock(&powerpc_cpu_hotplug_driver_mutex);
628}
629
630void cpu_hotplug_driver_unlock()
631{
632 mutex_unlock(&powerpc_cpu_hotplug_driver_mutex);
633}
622#endif 634#endif
diff --git a/arch/powerpc/kernel/swsusp_32.S b/arch/powerpc/kernel/swsusp_32.S
index b47d8ceffb52..b0754e237438 100644
--- a/arch/powerpc/kernel/swsusp_32.S
+++ b/arch/powerpc/kernel/swsusp_32.S
@@ -303,7 +303,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
303 lis r4,0x1000 303 lis r4,0x1000
3041: addic. r4,r4,-0x1000 3041: addic. r4,r4,-0x1000
305 tlbie r4 305 tlbie r4
306 blt 1b 306 bgt 1b
307 sync 307 sync
308 308
309 /* restore the MSR and turn on the MMU */ 309 /* restore the MSR and turn on the MMU */
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 9ba2cc88591d..6c6093d67f30 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -903,12 +903,21 @@ static void decrementer_set_mode(enum clock_event_mode mode,
903 decrementer_set_next_event(DECREMENTER_MAX, dev); 903 decrementer_set_next_event(DECREMENTER_MAX, dev);
904} 904}
905 905
906static inline uint64_t div_sc64(unsigned long ticks, unsigned long nsec,
907 int shift)
908{
909 uint64_t tmp = ((uint64_t)ticks) << shift;
910
911 do_div(tmp, nsec);
912 return tmp;
913}
914
906static void __init setup_clockevent_multiplier(unsigned long hz) 915static void __init setup_clockevent_multiplier(unsigned long hz)
907{ 916{
908 u64 mult, shift = 32; 917 u64 mult, shift = 32;
909 918
910 while (1) { 919 while (1) {
911 mult = div_sc(hz, NSEC_PER_SEC, shift); 920 mult = div_sc64(hz, NSEC_PER_SEC, shift);
912 if (mult && (mult >> 32UL) == 0UL) 921 if (mult && (mult >> 32UL) == 0UL)
913 break; 922 break;
914 923
diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index 5598f88f142e..e4beeb371a73 100644
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -390,6 +390,26 @@ static void kvmppc_mmu_book3s_64_mtsrin(struct kvm_vcpu *vcpu, u32 srnum,
390{ 390{
391 u64 rb = 0, rs = 0; 391 u64 rb = 0, rs = 0;
392 392
393 /*
394 * According to Book3 2.01 mtsrin is implemented as:
395 *
396 * The SLB entry specified by (RB)32:35 is loaded from register
397 * RS, as follows.
398 *
399 * SLBE Bit Source SLB Field
400 *
401 * 0:31 0x0000_0000 ESID-0:31
402 * 32:35 (RB)32:35 ESID-32:35
403 * 36 0b1 V
404 * 37:61 0x00_0000|| 0b0 VSID-0:24
405 * 62:88 (RS)37:63 VSID-25:51
406 * 89:91 (RS)33:35 Ks Kp N
407 * 92 (RS)36 L ((RS)36 must be 0b0)
408 * 93 0b0 C
409 */
410
411 dprintk("KVM MMU: mtsrin(0x%x, 0x%lx)\n", srnum, value);
412
393 /* ESID = srnum */ 413 /* ESID = srnum */
394 rb |= (srnum & 0xf) << 28; 414 rb |= (srnum & 0xf) << 28;
395 /* Set the valid bit */ 415 /* Set the valid bit */
@@ -400,7 +420,7 @@ static void kvmppc_mmu_book3s_64_mtsrin(struct kvm_vcpu *vcpu, u32 srnum,
400 /* VSID = VSID */ 420 /* VSID = VSID */
401 rs |= (value & 0xfffffff) << 12; 421 rs |= (value & 0xfffffff) << 12;
402 /* flags = flags */ 422 /* flags = flags */
403 rs |= ((value >> 27) & 0xf) << 9; 423 rs |= ((value >> 28) & 0x7) << 9;
404 424
405 kvmppc_mmu_book3s_64_slbmte(vcpu, rs, rb); 425 kvmppc_mmu_book3s_64_slbmte(vcpu, rs, rb);
406} 426}
diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
index 0d957a4c70fe..5a783d8e8e8e 100644
--- a/arch/powerpc/mm/mmap_64.c
+++ b/arch/powerpc/mm/mmap_64.c
@@ -47,7 +47,7 @@ static inline int mmap_is_legacy(void)
47 if (current->personality & ADDR_COMPAT_LAYOUT) 47 if (current->personality & ADDR_COMPAT_LAYOUT)
48 return 1; 48 return 1;
49 49
50 if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) 50 if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
51 return 1; 51 return 1;
52 52
53 return sysctl_legacy_va_layout; 53 return sysctl_legacy_va_layout;
@@ -77,7 +77,7 @@ static unsigned long mmap_rnd(void)
77 77
78static inline unsigned long mmap_base(void) 78static inline unsigned long mmap_base(void)
79{ 79{
80 unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; 80 unsigned long gap = rlimit(RLIMIT_STACK);
81 81
82 if (gap < MIN_GAP) 82 if (gap < MIN_GAP)
83 gap = MIN_GAP; 83 gap = MIN_GAP;
diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c
index c4d4a19235e0..eea120229cdb 100644
--- a/arch/powerpc/platforms/cell/spufs/coredump.c
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -54,7 +54,7 @@ static ssize_t do_coredump_read(int num, struct spu_context *ctx, void *buffer,
54 */ 54 */
55static int spufs_dump_write(struct file *file, const void *addr, int nr, loff_t *foffset) 55static int spufs_dump_write(struct file *file, const void *addr, int nr, loff_t *foffset)
56{ 56{
57 unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur; 57 unsigned long limit = rlimit(RLIMIT_CORE);
58 ssize_t written; 58 ssize_t written;
59 59
60 if (*foffset + nr > limit) 60 if (*foffset + nr > limit)
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index 657b72f68493..2aa8b5631beb 100644
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -474,6 +474,8 @@ static void __init get_viotape_info(struct device_node *vio_root)
474 struct vio_waitevent we; 474 struct vio_waitevent we;
475 int ret; 475 int ret;
476 476
477 init_completion(&we.com);
478
477 ret = viopath_open(viopath_hostLp, viomajorsubtype_tape, 2); 479 ret = viopath_open(viopath_hostLp, viomajorsubtype_tape, 2);
478 if (ret) { 480 if (ret) {
479 printk(KERN_WARNING "get_viotape_info: " 481 printk(KERN_WARNING "get_viotape_info: "
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 67b7a10f9fce..37bce52526da 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -236,7 +236,9 @@ static struct device_node *derive_parent(const char *path)
236 236
237int dlpar_attach_node(struct device_node *dn) 237int dlpar_attach_node(struct device_node *dn)
238{ 238{
239#ifdef CONFIG_PROC_DEVICETREE
239 struct proc_dir_entry *ent; 240 struct proc_dir_entry *ent;
241#endif
240 int rc; 242 int rc;
241 243
242 of_node_set_flag(dn, OF_DYNAMIC); 244 of_node_set_flag(dn, OF_DYNAMIC);
@@ -267,10 +269,10 @@ int dlpar_attach_node(struct device_node *dn)
267 269
268int dlpar_detach_node(struct device_node *dn) 270int dlpar_detach_node(struct device_node *dn)
269{ 271{
272#ifdef CONFIG_PROC_DEVICETREE
270 struct device_node *parent = dn->parent; 273 struct device_node *parent = dn->parent;
271 struct property *prop = dn->properties; 274 struct property *prop = dn->properties;
272 275
273#ifdef CONFIG_PROC_DEVICETREE
274 while (prop) { 276 while (prop) {
275 remove_proc_entry(prop->name, dn->pde); 277 remove_proc_entry(prop->name, dn->pde);
276 prop = prop->next; 278 prop = prop->next;
@@ -344,20 +346,6 @@ int dlpar_release_drc(u32 drc_index)
344 346
345#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE 347#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
346 348
347static DEFINE_MUTEX(pseries_cpu_hotplug_mutex);
348
349void cpu_hotplug_driver_lock(void)
350__acquires(pseries_cpu_hotplug_mutex)
351{
352 mutex_lock(&pseries_cpu_hotplug_mutex);
353}
354
355void cpu_hotplug_driver_unlock(void)
356__releases(pseries_cpu_hotplug_mutex)
357{
358 mutex_unlock(&pseries_cpu_hotplug_mutex);
359}
360
361static int dlpar_online_cpu(struct device_node *dn) 349static int dlpar_online_cpu(struct device_node *dn)
362{ 350{
363 int rc = 0; 351 int rc = 0;
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index b9b9e11609ec..d80f193cd871 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -163,14 +163,13 @@ static inline void lpar_qirr_info(int n_cpu , u8 value)
163/* Interface to generic irq subsystem */ 163/* Interface to generic irq subsystem */
164 164
165#ifdef CONFIG_SMP 165#ifdef CONFIG_SMP
166static int get_irq_server(unsigned int virq, unsigned int strict_check) 166static int get_irq_server(unsigned int virq, cpumask_t cpumask,
167 unsigned int strict_check)
167{ 168{
168 int server; 169 int server;
169 /* For the moment only implement delivery to all cpus or one cpu */ 170 /* For the moment only implement delivery to all cpus or one cpu */
170 cpumask_t cpumask;
171 cpumask_t tmp = CPU_MASK_NONE; 171 cpumask_t tmp = CPU_MASK_NONE;
172 172
173 cpumask_copy(&cpumask, irq_to_desc(virq)->affinity);
174 if (!distribute_irqs) 173 if (!distribute_irqs)
175 return default_server; 174 return default_server;
176 175
@@ -192,7 +191,8 @@ static int get_irq_server(unsigned int virq, unsigned int strict_check)
192 return default_server; 191 return default_server;
193} 192}
194#else 193#else
195static int get_irq_server(unsigned int virq, unsigned int strict_check) 194static int get_irq_server(unsigned int virq, cpumask_t cpumask,
195 unsigned int strict_check)
196{ 196{
197 return default_server; 197 return default_server;
198} 198}
@@ -211,7 +211,7 @@ static void xics_unmask_irq(unsigned int virq)
211 if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS) 211 if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
212 return; 212 return;
213 213
214 server = get_irq_server(virq, 0); 214 server = get_irq_server(virq, *(irq_to_desc(virq)->affinity), 0);
215 215
216 call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, 216 call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,
217 DEFAULT_PRIORITY); 217 DEFAULT_PRIORITY);
@@ -405,7 +405,7 @@ static int xics_set_affinity(unsigned int virq, const struct cpumask *cpumask)
405 * For the moment only implement delivery to all cpus or one cpu. 405 * For the moment only implement delivery to all cpus or one cpu.
406 * Get current irq_server for the given irq 406 * Get current irq_server for the given irq
407 */ 407 */
408 irq_server = get_irq_server(virq, 1); 408 irq_server = get_irq_server(virq, *cpumask, 1);
409 if (irq_server == -1) { 409 if (irq_server == -1) {
410 char cpulist[128]; 410 char cpulist[128];
411 cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask); 411 cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-06 15:43:30 -0500