aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
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/mpc5200_defconfig106
7 files changed, 418 insertions, 101 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/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#