aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/83xx
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/configs/83xx')
-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
14 files changed, 947 insertions, 302 deletions
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#
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-20 04:20:48 -0500