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_defconfig39
-rw-r--r--arch/powerpc/configs/83xx/kmeter1_defconfig28
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig44
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig45
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig40
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig44
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig39
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig38
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig41
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig40
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig39
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig41
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig46
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig39
14 files changed, 314 insertions, 249 deletions
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index 667688750854..04f16268e1c3 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:14 2010 4# Mon Apr 19 23:16:38 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -97,11 +97,6 @@ CONFIG_RCU_FANOUT=32
97# CONFIG_TREE_RCU_TRACE is not set 97# CONFIG_TREE_RCU_TRACE is not set
98# CONFIG_IKCONFIG is not set 98# CONFIG_IKCONFIG is not set
99CONFIG_LOG_BUF_SHIFT=14 99CONFIG_LOG_BUF_SHIFT=14
100CONFIG_GROUP_SCHED=y
101# CONFIG_FAIR_GROUP_SCHED is not set
102# CONFIG_RT_GROUP_SCHED is not set
103CONFIG_USER_SCHED=y
104# CONFIG_CGROUP_SCHED is not set
105# CONFIG_CGROUPS is not set 100# CONFIG_CGROUPS is not set
106# CONFIG_SYSFS_DEPRECATED_V2 is not set 101# CONFIG_SYSFS_DEPRECATED_V2 is not set
107# CONFIG_RELAY is not set 102# CONFIG_RELAY is not set
@@ -111,6 +106,7 @@ CONFIG_INITRAMFS_SOURCE=""
111CONFIG_RD_GZIP=y 106CONFIG_RD_GZIP=y
112# CONFIG_RD_BZIP2 is not set 107# CONFIG_RD_BZIP2 is not set
113# CONFIG_RD_LZMA is not set 108# CONFIG_RD_LZMA is not set
109# CONFIG_RD_LZO is not set
114# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 110# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
115CONFIG_SYSCTL=y 111CONFIG_SYSCTL=y
116CONFIG_ANON_INODES=y 112CONFIG_ANON_INODES=y
@@ -324,6 +320,7 @@ CONFIG_ISA_DMA_API=y
324# Bus options 320# Bus options
325# 321#
326CONFIG_ZONE_DMA=y 322CONFIG_ZONE_DMA=y
323# CONFIG_NEED_DMA_MAP_STATE is not set
327CONFIG_GENERIC_ISA_DMA=y 324CONFIG_GENERIC_ISA_DMA=y
328CONFIG_PPC_INDIRECT_PCI=y 325CONFIG_PPC_INDIRECT_PCI=y
329CONFIG_FSL_SOC=y 326CONFIG_FSL_SOC=y
@@ -335,7 +332,6 @@ CONFIG_PCI_SYSCALL=y
335# CONFIG_PCIEPORTBUS is not set 332# CONFIG_PCIEPORTBUS is not set
336CONFIG_ARCH_SUPPORTS_MSI=y 333CONFIG_ARCH_SUPPORTS_MSI=y
337# CONFIG_PCI_MSI is not set 334# CONFIG_PCI_MSI is not set
338# CONFIG_PCI_LEGACY is not set
339# CONFIG_PCI_STUB is not set 335# CONFIG_PCI_STUB is not set
340# CONFIG_PCI_IOV is not set 336# CONFIG_PCI_IOV is not set
341# CONFIG_PCCARD is not set 337# CONFIG_PCCARD is not set
@@ -361,7 +357,6 @@ CONFIG_NET=y
361# Networking options 357# Networking options
362# 358#
363CONFIG_PACKET=y 359CONFIG_PACKET=y
364# CONFIG_PACKET_MMAP is not set
365CONFIG_UNIX=y 360CONFIG_UNIX=y
366CONFIG_XFRM=y 361CONFIG_XFRM=y
367CONFIG_XFRM_USER=m 362CONFIG_XFRM_USER=m
@@ -542,6 +537,8 @@ CONFIG_MTD_PHYSMAP_OF=y
542# UBI - Unsorted block images 537# UBI - Unsorted block images
543# 538#
544# CONFIG_MTD_UBI is not set 539# CONFIG_MTD_UBI is not set
540CONFIG_OF_FLATTREE=y
541CONFIG_OF_DYNAMIC=y
545CONFIG_OF_DEVICE=y 542CONFIG_OF_DEVICE=y
546CONFIG_OF_I2C=y 543CONFIG_OF_I2C=y
547CONFIG_OF_MDIO=y 544CONFIG_OF_MDIO=y
@@ -578,6 +575,7 @@ CONFIG_MISC_DEVICES=y
578# CONFIG_ENCLOSURE_SERVICES is not set 575# CONFIG_ENCLOSURE_SERVICES is not set
579# CONFIG_HP_ILO is not set 576# CONFIG_HP_ILO is not set
580# CONFIG_ISL29003 is not set 577# CONFIG_ISL29003 is not set
578# CONFIG_SENSORS_TSL2550 is not set
581# CONFIG_DS1682 is not set 579# CONFIG_DS1682 is not set
582# CONFIG_C2PORT is not set 580# CONFIG_C2PORT is not set
583 581
@@ -595,6 +593,7 @@ CONFIG_HAVE_IDE=y
595# 593#
596# SCSI device support 594# SCSI device support
597# 595#
596CONFIG_SCSI_MOD=y
598# CONFIG_RAID_ATTRS is not set 597# CONFIG_RAID_ATTRS is not set
599# CONFIG_SCSI is not set 598# CONFIG_SCSI is not set
600# CONFIG_SCSI_DMA is not set 599# CONFIG_SCSI_DMA is not set
@@ -787,6 +786,7 @@ CONFIG_SERIAL_CORE=y
787CONFIG_SERIAL_CORE_CONSOLE=y 786CONFIG_SERIAL_CORE_CONSOLE=y
788# CONFIG_SERIAL_JSM is not set 787# CONFIG_SERIAL_JSM is not set
789# CONFIG_SERIAL_OF_PLATFORM is not set 788# CONFIG_SERIAL_OF_PLATFORM is not set
789# CONFIG_SERIAL_TIMBERDALE is not set
790# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 790# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
791CONFIG_UNIX98_PTYS=y 791CONFIG_UNIX98_PTYS=y
792# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 792# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -835,6 +835,7 @@ CONFIG_I2C_HELPER_AUTO=y
835CONFIG_I2C_MPC=y 835CONFIG_I2C_MPC=y
836# CONFIG_I2C_OCORES is not set 836# CONFIG_I2C_OCORES is not set
837# CONFIG_I2C_SIMTEC is not set 837# CONFIG_I2C_SIMTEC is not set
838# CONFIG_I2C_XILINX is not set
838 839
839# 840#
840# External I2C/SMBus adapter drivers 841# External I2C/SMBus adapter drivers
@@ -848,15 +849,9 @@ CONFIG_I2C_MPC=y
848# 849#
849# CONFIG_I2C_PCA_PLATFORM is not set 850# CONFIG_I2C_PCA_PLATFORM is not set
850# CONFIG_I2C_STUB is not set 851# CONFIG_I2C_STUB is not set
851
852#
853# Miscellaneous I2C Chip support
854#
855# CONFIG_SENSORS_TSL2550 is not set
856# CONFIG_I2C_DEBUG_CORE is not set 852# CONFIG_I2C_DEBUG_CORE is not set
857# CONFIG_I2C_DEBUG_ALGO is not set 853# CONFIG_I2C_DEBUG_ALGO is not set
858# CONFIG_I2C_DEBUG_BUS is not set 854# CONFIG_I2C_DEBUG_BUS is not set
859# CONFIG_I2C_DEBUG_CHIP is not set
860# CONFIG_SPI is not set 855# CONFIG_SPI is not set
861 856
862# 857#
@@ -882,10 +877,11 @@ CONFIG_HWMON=y
882# CONFIG_SENSORS_ADM1029 is not set 877# CONFIG_SENSORS_ADM1029 is not set
883# CONFIG_SENSORS_ADM1031 is not set 878# CONFIG_SENSORS_ADM1031 is not set
884# CONFIG_SENSORS_ADM9240 is not set 879# CONFIG_SENSORS_ADM9240 is not set
880# CONFIG_SENSORS_ADT7411 is not set
885# CONFIG_SENSORS_ADT7462 is not set 881# CONFIG_SENSORS_ADT7462 is not set
886# CONFIG_SENSORS_ADT7470 is not set 882# CONFIG_SENSORS_ADT7470 is not set
887# CONFIG_SENSORS_ADT7473 is not set
888# CONFIG_SENSORS_ADT7475 is not set 883# CONFIG_SENSORS_ADT7475 is not set
884# CONFIG_SENSORS_ASC7621 is not set
889# CONFIG_SENSORS_ATXP1 is not set 885# CONFIG_SENSORS_ATXP1 is not set
890# CONFIG_SENSORS_DS1621 is not set 886# CONFIG_SENSORS_DS1621 is not set
891# CONFIG_SENSORS_I5K_AMB is not set 887# CONFIG_SENSORS_I5K_AMB is not set
@@ -922,6 +918,7 @@ CONFIG_HWMON=y
922# CONFIG_SENSORS_SMSC47M192 is not set 918# CONFIG_SENSORS_SMSC47M192 is not set
923# CONFIG_SENSORS_SMSC47B397 is not set 919# CONFIG_SENSORS_SMSC47B397 is not set
924# CONFIG_SENSORS_ADS7828 is not set 920# CONFIG_SENSORS_ADS7828 is not set
921# CONFIG_SENSORS_AMC6821 is not set
925# CONFIG_SENSORS_THMC50 is not set 922# CONFIG_SENSORS_THMC50 is not set
926# CONFIG_SENSORS_TMP401 is not set 923# CONFIG_SENSORS_TMP401 is not set
927# CONFIG_SENSORS_TMP421 is not set 924# CONFIG_SENSORS_TMP421 is not set
@@ -970,18 +967,21 @@ CONFIG_SSB_POSSIBLE=y
970# Multifunction device drivers 967# Multifunction device drivers
971# 968#
972# CONFIG_MFD_CORE is not set 969# CONFIG_MFD_CORE is not set
970# CONFIG_MFD_88PM860X is not set
973# CONFIG_MFD_SM501 is not set 971# CONFIG_MFD_SM501 is not set
974# CONFIG_HTC_PASIC3 is not set 972# CONFIG_HTC_PASIC3 is not set
975# CONFIG_TWL4030_CORE is not set 973# CONFIG_TWL4030_CORE is not set
976# CONFIG_MFD_TMIO is not set 974# CONFIG_MFD_TMIO is not set
977# CONFIG_PMIC_DA903X is not set 975# CONFIG_PMIC_DA903X is not set
978# CONFIG_PMIC_ADP5520 is not set 976# CONFIG_PMIC_ADP5520 is not set
977# CONFIG_MFD_MAX8925 is not set
979# CONFIG_MFD_WM8400 is not set 978# CONFIG_MFD_WM8400 is not set
980# CONFIG_MFD_WM831X is not set 979# CONFIG_MFD_WM831X is not set
981# CONFIG_MFD_WM8350_I2C is not set 980# CONFIG_MFD_WM8350_I2C is not set
981# CONFIG_MFD_WM8994 is not set
982# CONFIG_MFD_PCF50633 is not set 982# CONFIG_MFD_PCF50633 is not set
983# CONFIG_AB3100_CORE is not set 983# CONFIG_AB3100_CORE is not set
984# CONFIG_MFD_88PM8607 is not set 984# CONFIG_LPC_SCH is not set
985# CONFIG_REGULATOR is not set 985# CONFIG_REGULATOR is not set
986# CONFIG_MEDIA_SUPPORT is not set 986# CONFIG_MEDIA_SUPPORT is not set
987 987
@@ -990,6 +990,7 @@ CONFIG_SSB_POSSIBLE=y
990# 990#
991# CONFIG_AGP is not set 991# CONFIG_AGP is not set
992CONFIG_VGA_ARB=y 992CONFIG_VGA_ARB=y
993CONFIG_VGA_ARB_MAX_GPUS=16
993# CONFIG_DRM is not set 994# CONFIG_DRM is not set
994# CONFIG_VGASTATE is not set 995# CONFIG_VGASTATE is not set
995CONFIG_VIDEO_OUTPUT_CONTROL=m 996CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1082,7 +1083,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1082# CONFIG_USB_RIO500 is not set 1083# CONFIG_USB_RIO500 is not set
1083# CONFIG_USB_LEGOTOWER is not set 1084# CONFIG_USB_LEGOTOWER is not set
1084# CONFIG_USB_LCD is not set 1085# CONFIG_USB_LCD is not set
1085# CONFIG_USB_BERRY_CHARGE is not set
1086# CONFIG_USB_LED is not set 1086# CONFIG_USB_LED is not set
1087# CONFIG_USB_CYPRESS_CY7C63 is not set 1087# CONFIG_USB_CYPRESS_CY7C63 is not set
1088# CONFIG_USB_CYTHERM is not set 1088# CONFIG_USB_CYTHERM is not set
@@ -1095,7 +1095,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1095# CONFIG_USB_IOWARRIOR is not set 1095# CONFIG_USB_IOWARRIOR is not set
1096# CONFIG_USB_TEST is not set 1096# CONFIG_USB_TEST is not set
1097# CONFIG_USB_ISIGHTFW is not set 1097# CONFIG_USB_ISIGHTFW is not set
1098# CONFIG_USB_VST is not set
1099# CONFIG_USB_GADGET is not set 1098# CONFIG_USB_GADGET is not set
1100 1099
1101# 1100#
@@ -1258,6 +1257,7 @@ CONFIG_JFFS2_ZLIB=y
1258# CONFIG_JFFS2_LZO is not set 1257# CONFIG_JFFS2_LZO is not set
1259CONFIG_JFFS2_RTIME=y 1258CONFIG_JFFS2_RTIME=y
1260# CONFIG_JFFS2_RUBIN is not set 1259# CONFIG_JFFS2_RUBIN is not set
1260# CONFIG_LOGFS is not set
1261# CONFIG_CRAMFS is not set 1261# CONFIG_CRAMFS is not set
1262# CONFIG_SQUASHFS is not set 1262# CONFIG_SQUASHFS is not set
1263# CONFIG_VXFS_FS is not set 1263# CONFIG_VXFS_FS is not set
@@ -1284,6 +1284,7 @@ CONFIG_SUNRPC_GSS=y
1284CONFIG_RPCSEC_GSS_KRB5=y 1284CONFIG_RPCSEC_GSS_KRB5=y
1285# CONFIG_RPCSEC_GSS_SPKM3 is not set 1285# CONFIG_RPCSEC_GSS_SPKM3 is not set
1286# CONFIG_SMB_FS is not set 1286# CONFIG_SMB_FS is not set
1287# CONFIG_CEPH_FS is not set
1287# CONFIG_CIFS is not set 1288# CONFIG_CIFS is not set
1288# CONFIG_NCP_FS is not set 1289# CONFIG_NCP_FS is not set
1289# CONFIG_CODA_FS is not set 1290# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index 8b1aa806e548..1843ee11823b 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:14 2010 4# Mon Apr 19 23:16:39 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -98,7 +98,6 @@ CONFIG_RCU_FANOUT=32
98# CONFIG_TREE_RCU_TRACE is not set 98# CONFIG_TREE_RCU_TRACE is not set
99# CONFIG_IKCONFIG is not set 99# CONFIG_IKCONFIG is not set
100CONFIG_LOG_BUF_SHIFT=14 100CONFIG_LOG_BUF_SHIFT=14
101# CONFIG_GROUP_SCHED is not set
102# CONFIG_CGROUPS is not set 101# CONFIG_CGROUPS is not set
103# CONFIG_SYSFS_DEPRECATED_V2 is not set 102# CONFIG_SYSFS_DEPRECATED_V2 is not set
104# CONFIG_RELAY is not set 103# CONFIG_RELAY is not set
@@ -318,6 +317,7 @@ CONFIG_ISA_DMA_API=y
318# Bus options 317# Bus options
319# 318#
320CONFIG_ZONE_DMA=y 319CONFIG_ZONE_DMA=y
320# CONFIG_NEED_DMA_MAP_STATE is not set
321CONFIG_GENERIC_ISA_DMA=y 321CONFIG_GENERIC_ISA_DMA=y
322CONFIG_FSL_SOC=y 322CONFIG_FSL_SOC=y
323CONFIG_PPC_PCI_CHOICE=y 323CONFIG_PPC_PCI_CHOICE=y
@@ -346,7 +346,6 @@ CONFIG_NET=y
346# Networking options 346# Networking options
347# 347#
348CONFIG_PACKET=y 348CONFIG_PACKET=y
349# CONFIG_PACKET_MMAP is not set
350CONFIG_UNIX=y 349CONFIG_UNIX=y
351# CONFIG_NET_KEY is not set 350# CONFIG_NET_KEY is not set
352CONFIG_INET=y 351CONFIG_INET=y
@@ -387,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
387# CONFIG_ATM is not set 386# CONFIG_ATM is not set
388CONFIG_STP=m 387CONFIG_STP=m
389CONFIG_BRIDGE=m 388CONFIG_BRIDGE=m
389CONFIG_BRIDGE_IGMP_SNOOPING=y
390# CONFIG_NET_DSA is not set 390# CONFIG_NET_DSA is not set
391CONFIG_VLAN_8021Q=y 391CONFIG_VLAN_8021Q=y
392# CONFIG_VLAN_8021Q_GVRP is not set 392# CONFIG_VLAN_8021Q_GVRP is not set
@@ -539,6 +539,8 @@ CONFIG_MTD_UBI_DEBUG=y
539# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set 539# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
540# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set 540# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
541# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set 541# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
542CONFIG_OF_FLATTREE=y
543CONFIG_OF_DYNAMIC=y
542CONFIG_OF_DEVICE=y 544CONFIG_OF_DEVICE=y
543CONFIG_OF_I2C=y 545CONFIG_OF_I2C=y
544CONFIG_OF_MDIO=y 546CONFIG_OF_MDIO=y
@@ -563,6 +565,7 @@ CONFIG_HAVE_IDE=y
563# 565#
564# SCSI device support 566# SCSI device support
565# 567#
568CONFIG_SCSI_MOD=y
566# CONFIG_RAID_ATTRS is not set 569# CONFIG_RAID_ATTRS is not set
567# CONFIG_SCSI is not set 570# CONFIG_SCSI is not set
568# CONFIG_SCSI_DMA is not set 571# CONFIG_SCSI_DMA is not set
@@ -690,6 +693,7 @@ CONFIG_SERIAL_CORE=y
690CONFIG_SERIAL_CORE_CONSOLE=y 693CONFIG_SERIAL_CORE_CONSOLE=y
691# CONFIG_SERIAL_OF_PLATFORM is not set 694# CONFIG_SERIAL_OF_PLATFORM is not set
692# CONFIG_SERIAL_QE is not set 695# CONFIG_SERIAL_QE is not set
696# CONFIG_SERIAL_TIMBERDALE is not set
693# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 697# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
694CONFIG_UNIX98_PTYS=y 698CONFIG_UNIX98_PTYS=y
695# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 699# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -720,6 +724,7 @@ CONFIG_I2C_HELPER_AUTO=y
720CONFIG_I2C_MPC=y 724CONFIG_I2C_MPC=y
721# CONFIG_I2C_OCORES is not set 725# CONFIG_I2C_OCORES is not set
722# CONFIG_I2C_SIMTEC is not set 726# CONFIG_I2C_SIMTEC is not set
727# CONFIG_I2C_XILINX is not set
723 728
724# 729#
725# External I2C/SMBus adapter drivers 730# External I2C/SMBus adapter drivers
@@ -732,15 +737,9 @@ CONFIG_I2C_MPC=y
732# 737#
733# CONFIG_I2C_PCA_PLATFORM is not set 738# CONFIG_I2C_PCA_PLATFORM is not set
734# CONFIG_I2C_STUB is not set 739# CONFIG_I2C_STUB is not set
735
736#
737# Miscellaneous I2C Chip support
738#
739# CONFIG_SENSORS_TSL2550 is not set
740# CONFIG_I2C_DEBUG_CORE is not set 740# CONFIG_I2C_DEBUG_CORE is not set
741# CONFIG_I2C_DEBUG_ALGO is not set 741# CONFIG_I2C_DEBUG_ALGO is not set
742# CONFIG_I2C_DEBUG_BUS is not set 742# CONFIG_I2C_DEBUG_BUS is not set
743# CONFIG_I2C_DEBUG_CHIP is not set
744# CONFIG_SPI is not set 743# CONFIG_SPI is not set
745 744
746# 745#
@@ -765,18 +764,20 @@ CONFIG_SSB_POSSIBLE=y
765# Multifunction device drivers 764# Multifunction device drivers
766# 765#
767# CONFIG_MFD_CORE is not set 766# CONFIG_MFD_CORE is not set
767# CONFIG_MFD_88PM860X is not set
768# CONFIG_MFD_SM501 is not set 768# CONFIG_MFD_SM501 is not set
769# CONFIG_HTC_PASIC3 is not set 769# CONFIG_HTC_PASIC3 is not set
770# CONFIG_TWL4030_CORE is not set 770# CONFIG_TWL4030_CORE is not set
771# CONFIG_MFD_TMIO is not set 771# CONFIG_MFD_TMIO is not set
772# CONFIG_PMIC_DA903X is not set 772# CONFIG_PMIC_DA903X is not set
773# CONFIG_PMIC_ADP5520 is not set 773# CONFIG_PMIC_ADP5520 is not set
774# CONFIG_MFD_MAX8925 is not set
774# CONFIG_MFD_WM8400 is not set 775# CONFIG_MFD_WM8400 is not set
775# CONFIG_MFD_WM831X is not set 776# CONFIG_MFD_WM831X is not set
776# CONFIG_MFD_WM8350_I2C is not set 777# CONFIG_MFD_WM8350_I2C is not set
778# CONFIG_MFD_WM8994 is not set
777# CONFIG_MFD_PCF50633 is not set 779# CONFIG_MFD_PCF50633 is not set
778# CONFIG_AB3100_CORE is not set 780# CONFIG_AB3100_CORE is not set
779# CONFIG_MFD_88PM8607 is not set
780# CONFIG_REGULATOR is not set 781# CONFIG_REGULATOR is not set
781# CONFIG_MEDIA_SUPPORT is not set 782# CONFIG_MEDIA_SUPPORT is not set
782 783
@@ -805,8 +806,6 @@ CONFIG_SSB_POSSIBLE=y
805CONFIG_UIO=y 806CONFIG_UIO=y
806# CONFIG_UIO_PDRV is not set 807# CONFIG_UIO_PDRV is not set
807# CONFIG_UIO_PDRV_GENIRQ is not set 808# CONFIG_UIO_PDRV_GENIRQ is not set
808# CONFIG_UIO_SMX is not set
809# CONFIG_UIO_SERCOS3 is not set
810 809
811# 810#
812# TI VLYNQ 811# TI VLYNQ
@@ -887,6 +886,7 @@ CONFIG_JFFS2_ZLIB=y
887CONFIG_JFFS2_RTIME=y 886CONFIG_JFFS2_RTIME=y
888# CONFIG_JFFS2_RUBIN is not set 887# CONFIG_JFFS2_RUBIN is not set
889# CONFIG_UBIFS_FS is not set 888# CONFIG_UBIFS_FS is not set
889# CONFIG_LOGFS is not set
890# CONFIG_CRAMFS is not set 890# CONFIG_CRAMFS is not set
891# CONFIG_SQUASHFS is not set 891# CONFIG_SQUASHFS is not set
892# CONFIG_VXFS_FS is not set 892# CONFIG_VXFS_FS is not set
@@ -911,6 +911,7 @@ CONFIG_SUNRPC=y
911# CONFIG_RPCSEC_GSS_KRB5 is not set 911# CONFIG_RPCSEC_GSS_KRB5 is not set
912# CONFIG_RPCSEC_GSS_SPKM3 is not set 912# CONFIG_RPCSEC_GSS_SPKM3 is not set
913# CONFIG_SMB_FS is not set 913# CONFIG_SMB_FS is not set
914# CONFIG_CEPH_FS is not set
914# CONFIG_CIFS is not set 915# CONFIG_CIFS is not set
915# CONFIG_NCP_FS is not set 916# CONFIG_NCP_FS is not set
916# CONFIG_CODA_FS is not set 917# CONFIG_CODA_FS is not set
@@ -976,6 +977,7 @@ CONFIG_DEBUG_FS=y
976CONFIG_DEBUG_BUGVERBOSE=y 977CONFIG_DEBUG_BUGVERBOSE=y
977# CONFIG_DEBUG_MEMORY_INIT is not set 978# CONFIG_DEBUG_MEMORY_INIT is not set
978# CONFIG_RCU_CPU_STALL_DETECTOR is not set 979# CONFIG_RCU_CPU_STALL_DETECTOR is not set
980# CONFIG_LKDTM is not set
979# CONFIG_LATENCYTOP is not set 981# CONFIG_LATENCYTOP is not set
980CONFIG_SYSCTL_SYSCALL_CHECK=y 982CONFIG_SYSCTL_SYSCALL_CHECK=y
981CONFIG_HAVE_FUNCTION_TRACER=y 983CONFIG_HAVE_FUNCTION_TRACER=y
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 6fbf91f763df..78ae3bf1e9c5 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:15 2010 4# Mon Apr 19 23:16:40 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100# CONFIG_FAIR_GROUP_SCHED is not set
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -323,6 +319,7 @@ CONFIG_ISA_DMA_API=y
323# Bus options 319# Bus options
324# 320#
325CONFIG_ZONE_DMA=y 321CONFIG_ZONE_DMA=y
322# CONFIG_NEED_DMA_MAP_STATE is not set
326CONFIG_GENERIC_ISA_DMA=y 323CONFIG_GENERIC_ISA_DMA=y
327CONFIG_PPC_INDIRECT_PCI=y 324CONFIG_PPC_INDIRECT_PCI=y
328CONFIG_FSL_SOC=y 325CONFIG_FSL_SOC=y
@@ -334,7 +331,6 @@ CONFIG_PCI_SYSCALL=y
334# CONFIG_PCIEPORTBUS is not set 331# CONFIG_PCIEPORTBUS is not set
335CONFIG_ARCH_SUPPORTS_MSI=y 332CONFIG_ARCH_SUPPORTS_MSI=y
336# CONFIG_PCI_MSI is not set 333# CONFIG_PCI_MSI is not set
337# CONFIG_PCI_LEGACY is not set
338# CONFIG_PCI_DEBUG is not set 334# CONFIG_PCI_DEBUG is not set
339# CONFIG_PCI_STUB is not set 335# CONFIG_PCI_STUB is not set
340# CONFIG_PCI_IOV is not set 336# CONFIG_PCI_IOV is not set
@@ -361,7 +357,6 @@ CONFIG_NET=y
361# Networking options 357# Networking options
362# 358#
363CONFIG_PACKET=y 359CONFIG_PACKET=y
364# CONFIG_PACKET_MMAP is not set
365CONFIG_UNIX=y 360CONFIG_UNIX=y
366CONFIG_XFRM=y 361CONFIG_XFRM=y
367# CONFIG_XFRM_USER is not set 362# CONFIG_XFRM_USER is not set
@@ -555,6 +550,8 @@ CONFIG_MTD_NAND_FSL_ELBC=y
555# UBI - Unsorted block images 550# UBI - Unsorted block images
556# 551#
557# CONFIG_MTD_UBI is not set 552# CONFIG_MTD_UBI is not set
553CONFIG_OF_FLATTREE=y
554CONFIG_OF_DYNAMIC=y
558CONFIG_OF_DEVICE=y 555CONFIG_OF_DEVICE=y
559CONFIG_OF_I2C=y 556CONFIG_OF_I2C=y
560CONFIG_OF_SPI=y 557CONFIG_OF_SPI=y
@@ -592,6 +589,7 @@ CONFIG_MISC_DEVICES=y
592# CONFIG_ENCLOSURE_SERVICES is not set 589# CONFIG_ENCLOSURE_SERVICES is not set
593# CONFIG_HP_ILO is not set 590# CONFIG_HP_ILO is not set
594# CONFIG_ISL29003 is not set 591# CONFIG_ISL29003 is not set
592# CONFIG_SENSORS_TSL2550 is not set
595# CONFIG_DS1682 is not set 593# CONFIG_DS1682 is not set
596# CONFIG_TI_DAC7512 is not set 594# CONFIG_TI_DAC7512 is not set
597# CONFIG_C2PORT is not set 595# CONFIG_C2PORT is not set
@@ -611,6 +609,7 @@ CONFIG_HAVE_IDE=y
611# 609#
612# SCSI device support 610# SCSI device support
613# 611#
612CONFIG_SCSI_MOD=y
614# CONFIG_RAID_ATTRS is not set 613# CONFIG_RAID_ATTRS is not set
615CONFIG_SCSI=y 614CONFIG_SCSI=y
616CONFIG_SCSI_DMA=y 615CONFIG_SCSI_DMA=y
@@ -771,6 +770,7 @@ CONFIG_NET_PCI=y
771# CONFIG_PCNET32 is not set 770# CONFIG_PCNET32 is not set
772# CONFIG_AMD8111_ETH is not set 771# CONFIG_AMD8111_ETH is not set
773# CONFIG_ADAPTEC_STARFIRE is not set 772# CONFIG_ADAPTEC_STARFIRE is not set
773# CONFIG_KSZ884X_PCI is not set
774# CONFIG_B44 is not set 774# CONFIG_B44 is not set
775# CONFIG_FORCEDETH is not set 775# CONFIG_FORCEDETH is not set
776CONFIG_E100=y 776CONFIG_E100=y
@@ -823,6 +823,8 @@ CONFIG_NETDEV_10000=y
823# CONFIG_CHELSIO_T1 is not set 823# CONFIG_CHELSIO_T1 is not set
824CONFIG_CHELSIO_T3_DEPENDS=y 824CONFIG_CHELSIO_T3_DEPENDS=y
825# CONFIG_CHELSIO_T3 is not set 825# CONFIG_CHELSIO_T3 is not set
826CONFIG_CHELSIO_T4_DEPENDS=y
827# CONFIG_CHELSIO_T4 is not set
826# CONFIG_ENIC is not set 828# CONFIG_ENIC is not set
827# CONFIG_IXGBE is not set 829# CONFIG_IXGBE is not set
828# CONFIG_IXGB is not set 830# CONFIG_IXGB is not set
@@ -835,6 +837,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
835# CONFIG_MLX4_CORE is not set 837# CONFIG_MLX4_CORE is not set
836# CONFIG_TEHUTI is not set 838# CONFIG_TEHUTI is not set
837# CONFIG_BNX2X is not set 839# CONFIG_BNX2X is not set
840# CONFIG_QLCNIC is not set
838# CONFIG_QLGE is not set 841# CONFIG_QLGE is not set
839# CONFIG_SFC is not set 842# CONFIG_SFC is not set
840# CONFIG_BE2NET is not set 843# CONFIG_BE2NET is not set
@@ -930,6 +933,7 @@ CONFIG_SERIAL_CORE=y
930CONFIG_SERIAL_CORE_CONSOLE=y 933CONFIG_SERIAL_CORE_CONSOLE=y
931# CONFIG_SERIAL_JSM is not set 934# CONFIG_SERIAL_JSM is not set
932# CONFIG_SERIAL_OF_PLATFORM is not set 935# CONFIG_SERIAL_OF_PLATFORM is not set
936# CONFIG_SERIAL_TIMBERDALE is not set
933# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 937# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
934CONFIG_UNIX98_PTYS=y 938CONFIG_UNIX98_PTYS=y
935# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 939# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -979,6 +983,7 @@ CONFIG_I2C_HELPER_AUTO=y
979CONFIG_I2C_MPC=y 983CONFIG_I2C_MPC=y
980# CONFIG_I2C_OCORES is not set 984# CONFIG_I2C_OCORES is not set
981# CONFIG_I2C_SIMTEC is not set 985# CONFIG_I2C_SIMTEC is not set
986# CONFIG_I2C_XILINX is not set
982 987
983# 988#
984# External I2C/SMBus adapter drivers 989# External I2C/SMBus adapter drivers
@@ -992,15 +997,9 @@ CONFIG_I2C_MPC=y
992# 997#
993# CONFIG_I2C_PCA_PLATFORM is not set 998# CONFIG_I2C_PCA_PLATFORM is not set
994# CONFIG_I2C_STUB is not set 999# CONFIG_I2C_STUB is not set
995
996#
997# Miscellaneous I2C Chip support
998#
999# CONFIG_SENSORS_TSL2550 is not set
1000# CONFIG_I2C_DEBUG_CORE is not set 1000# CONFIG_I2C_DEBUG_CORE is not set
1001# CONFIG_I2C_DEBUG_ALGO is not set 1001# CONFIG_I2C_DEBUG_ALGO is not set
1002# CONFIG_I2C_DEBUG_BUS is not set 1002# CONFIG_I2C_DEBUG_BUS is not set
1003# CONFIG_I2C_DEBUG_CHIP is not set
1004CONFIG_SPI=y 1003CONFIG_SPI=y
1005# CONFIG_SPI_DEBUG is not set 1004# CONFIG_SPI_DEBUG is not set
1006CONFIG_SPI_MASTER=y 1005CONFIG_SPI_MASTER=y
@@ -1043,10 +1042,11 @@ CONFIG_HWMON=y
1043# CONFIG_SENSORS_ADM1029 is not set 1042# CONFIG_SENSORS_ADM1029 is not set
1044# CONFIG_SENSORS_ADM1031 is not set 1043# CONFIG_SENSORS_ADM1031 is not set
1045# CONFIG_SENSORS_ADM9240 is not set 1044# CONFIG_SENSORS_ADM9240 is not set
1045# CONFIG_SENSORS_ADT7411 is not set
1046# CONFIG_SENSORS_ADT7462 is not set 1046# CONFIG_SENSORS_ADT7462 is not set
1047# CONFIG_SENSORS_ADT7470 is not set 1047# CONFIG_SENSORS_ADT7470 is not set
1048# CONFIG_SENSORS_ADT7473 is not set
1049# CONFIG_SENSORS_ADT7475 is not set 1048# CONFIG_SENSORS_ADT7475 is not set
1049# CONFIG_SENSORS_ASC7621 is not set
1050# CONFIG_SENSORS_ATXP1 is not set 1050# CONFIG_SENSORS_ATXP1 is not set
1051# CONFIG_SENSORS_DS1621 is not set 1051# CONFIG_SENSORS_DS1621 is not set
1052# CONFIG_SENSORS_I5K_AMB is not set 1052# CONFIG_SENSORS_I5K_AMB is not set
@@ -1085,6 +1085,7 @@ CONFIG_HWMON=y
1085# CONFIG_SENSORS_SMSC47M192 is not set 1085# CONFIG_SENSORS_SMSC47M192 is not set
1086# CONFIG_SENSORS_SMSC47B397 is not set 1086# CONFIG_SENSORS_SMSC47B397 is not set
1087# CONFIG_SENSORS_ADS7828 is not set 1087# CONFIG_SENSORS_ADS7828 is not set
1088# CONFIG_SENSORS_AMC6821 is not set
1088# CONFIG_SENSORS_THMC50 is not set 1089# CONFIG_SENSORS_THMC50 is not set
1089# CONFIG_SENSORS_TMP401 is not set 1090# CONFIG_SENSORS_TMP401 is not set
1090# CONFIG_SENSORS_TMP421 is not set 1091# CONFIG_SENSORS_TMP421 is not set
@@ -1133,21 +1134,24 @@ CONFIG_SSB_POSSIBLE=y
1133# Multifunction device drivers 1134# Multifunction device drivers
1134# 1135#
1135# CONFIG_MFD_CORE is not set 1136# CONFIG_MFD_CORE is not set
1137# CONFIG_MFD_88PM860X is not set
1136# CONFIG_MFD_SM501 is not set 1138# CONFIG_MFD_SM501 is not set
1137# CONFIG_HTC_PASIC3 is not set 1139# CONFIG_HTC_PASIC3 is not set
1138# CONFIG_TWL4030_CORE is not set 1140# CONFIG_TWL4030_CORE is not set
1139# CONFIG_MFD_TMIO is not set 1141# CONFIG_MFD_TMIO is not set
1140# CONFIG_PMIC_DA903X is not set 1142# CONFIG_PMIC_DA903X is not set
1141# CONFIG_PMIC_ADP5520 is not set 1143# CONFIG_PMIC_ADP5520 is not set
1144# CONFIG_MFD_MAX8925 is not set
1142# CONFIG_MFD_WM8400 is not set 1145# CONFIG_MFD_WM8400 is not set
1143# CONFIG_MFD_WM831X is not set 1146# CONFIG_MFD_WM831X is not set
1144# CONFIG_MFD_WM8350_I2C is not set 1147# CONFIG_MFD_WM8350_I2C is not set
1148# CONFIG_MFD_WM8994 is not set
1145# CONFIG_MFD_PCF50633 is not set 1149# CONFIG_MFD_PCF50633 is not set
1146# CONFIG_MFD_MC13783 is not set 1150# CONFIG_MFD_MC13783 is not set
1147# CONFIG_AB3100_CORE is not set 1151# CONFIG_AB3100_CORE is not set
1148# CONFIG_EZX_PCAP is not set 1152# CONFIG_EZX_PCAP is not set
1149# CONFIG_MFD_88PM8607 is not set
1150# CONFIG_AB4500_CORE is not set 1153# CONFIG_AB4500_CORE is not set
1154# CONFIG_LPC_SCH is not set
1151# CONFIG_REGULATOR is not set 1155# CONFIG_REGULATOR is not set
1152# CONFIG_MEDIA_SUPPORT is not set 1156# CONFIG_MEDIA_SUPPORT is not set
1153 1157
@@ -1156,6 +1160,7 @@ CONFIG_SSB_POSSIBLE=y
1156# 1160#
1157# CONFIG_AGP is not set 1161# CONFIG_AGP is not set
1158CONFIG_VGA_ARB=y 1162CONFIG_VGA_ARB=y
1163CONFIG_VGA_ARB_MAX_GPUS=16
1159# CONFIG_DRM is not set 1164# CONFIG_DRM is not set
1160# CONFIG_VGASTATE is not set 1165# CONFIG_VGASTATE is not set
1161CONFIG_VIDEO_OUTPUT_CONTROL=m 1166CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1288,7 +1293,6 @@ CONFIG_USB_STORAGE=y
1288# CONFIG_USB_RIO500 is not set 1293# CONFIG_USB_RIO500 is not set
1289# CONFIG_USB_LEGOTOWER is not set 1294# CONFIG_USB_LEGOTOWER is not set
1290# CONFIG_USB_LCD is not set 1295# CONFIG_USB_LCD is not set
1291# CONFIG_USB_BERRY_CHARGE is not set
1292# CONFIG_USB_LED is not set 1296# CONFIG_USB_LED is not set
1293# CONFIG_USB_CYPRESS_CY7C63 is not set 1297# CONFIG_USB_CYPRESS_CY7C63 is not set
1294# CONFIG_USB_CYTHERM is not set 1298# CONFIG_USB_CYTHERM is not set
@@ -1301,7 +1305,6 @@ CONFIG_USB_STORAGE=y
1301# CONFIG_USB_IOWARRIOR is not set 1305# CONFIG_USB_IOWARRIOR is not set
1302# CONFIG_USB_TEST is not set 1306# CONFIG_USB_TEST is not set
1303# CONFIG_USB_ISIGHTFW is not set 1307# CONFIG_USB_ISIGHTFW is not set
1304# CONFIG_USB_VST is not set
1305CONFIG_USB_GADGET=y 1308CONFIG_USB_GADGET=y
1306# CONFIG_USB_GADGET_DEBUG is not set 1309# CONFIG_USB_GADGET_DEBUG is not set
1307# CONFIG_USB_GADGET_DEBUG_FILES is not set 1310# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1340,6 +1343,7 @@ CONFIG_USB_ETH_RNDIS=y
1340# CONFIG_USB_MIDI_GADGET is not set 1343# CONFIG_USB_MIDI_GADGET is not set
1341# CONFIG_USB_G_PRINTER is not set 1344# CONFIG_USB_G_PRINTER is not set
1342# CONFIG_USB_CDC_COMPOSITE is not set 1345# CONFIG_USB_CDC_COMPOSITE is not set
1346# CONFIG_USB_G_NOKIA is not set
1343# CONFIG_USB_G_MULTI is not set 1347# CONFIG_USB_G_MULTI is not set
1344 1348
1345# 1349#
@@ -1510,6 +1514,7 @@ CONFIG_JFFS2_ZLIB=y
1510# CONFIG_JFFS2_LZO is not set 1514# CONFIG_JFFS2_LZO is not set
1511CONFIG_JFFS2_RTIME=y 1515CONFIG_JFFS2_RTIME=y
1512# CONFIG_JFFS2_RUBIN is not set 1516# CONFIG_JFFS2_RUBIN is not set
1517# CONFIG_LOGFS is not set
1513# CONFIG_CRAMFS is not set 1518# CONFIG_CRAMFS is not set
1514# CONFIG_SQUASHFS is not set 1519# CONFIG_SQUASHFS is not set
1515# CONFIG_VXFS_FS is not set 1520# CONFIG_VXFS_FS is not set
@@ -1536,6 +1541,7 @@ CONFIG_SUNRPC_GSS=y
1536CONFIG_RPCSEC_GSS_KRB5=y 1541CONFIG_RPCSEC_GSS_KRB5=y
1537# CONFIG_RPCSEC_GSS_SPKM3 is not set 1542# CONFIG_RPCSEC_GSS_SPKM3 is not set
1538# CONFIG_SMB_FS is not set 1543# CONFIG_SMB_FS is not set
1544# CONFIG_CEPH_FS is not set
1539# CONFIG_CIFS is not set 1545# CONFIG_CIFS is not set
1540# CONFIG_NCP_FS is not set 1546# CONFIG_NCP_FS is not set
1541# CONFIG_CODA_FS is not set 1547# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index d2833885403c..cccb71393aca 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:16 2010 4# Mon Apr 19 23:16:40 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100# CONFIG_FAIR_GROUP_SCHED is not set
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -323,6 +319,7 @@ CONFIG_ISA_DMA_API=y
323# Bus options 319# Bus options
324# 320#
325CONFIG_ZONE_DMA=y 321CONFIG_ZONE_DMA=y
322# CONFIG_NEED_DMA_MAP_STATE is not set
326CONFIG_GENERIC_ISA_DMA=y 323CONFIG_GENERIC_ISA_DMA=y
327CONFIG_PPC_INDIRECT_PCI=y 324CONFIG_PPC_INDIRECT_PCI=y
328CONFIG_FSL_SOC=y 325CONFIG_FSL_SOC=y
@@ -334,7 +331,6 @@ CONFIG_PCI_SYSCALL=y
334# CONFIG_PCIEPORTBUS is not set 331# CONFIG_PCIEPORTBUS is not set
335CONFIG_ARCH_SUPPORTS_MSI=y 332CONFIG_ARCH_SUPPORTS_MSI=y
336# CONFIG_PCI_MSI is not set 333# CONFIG_PCI_MSI is not set
337# CONFIG_PCI_LEGACY is not set
338# CONFIG_PCI_DEBUG is not set 334# CONFIG_PCI_DEBUG is not set
339# CONFIG_PCI_STUB is not set 335# CONFIG_PCI_STUB is not set
340# CONFIG_PCI_IOV is not set 336# CONFIG_PCI_IOV is not set
@@ -361,7 +357,6 @@ CONFIG_NET=y
361# Networking options 357# Networking options
362# 358#
363CONFIG_PACKET=y 359CONFIG_PACKET=y
364# CONFIG_PACKET_MMAP is not set
365CONFIG_UNIX=y 360CONFIG_UNIX=y
366CONFIG_XFRM=y 361CONFIG_XFRM=y
367# CONFIG_XFRM_USER is not set 362# CONFIG_XFRM_USER is not set
@@ -555,6 +550,8 @@ CONFIG_MTD_NAND_IDS=y
555# UBI - Unsorted block images 550# UBI - Unsorted block images
556# 551#
557# CONFIG_MTD_UBI is not set 552# CONFIG_MTD_UBI is not set
553CONFIG_OF_FLATTREE=y
554CONFIG_OF_DYNAMIC=y
558CONFIG_OF_DEVICE=y 555CONFIG_OF_DEVICE=y
559CONFIG_OF_I2C=y 556CONFIG_OF_I2C=y
560CONFIG_OF_SPI=y 557CONFIG_OF_SPI=y
@@ -592,6 +589,7 @@ CONFIG_MISC_DEVICES=y
592# CONFIG_ENCLOSURE_SERVICES is not set 589# CONFIG_ENCLOSURE_SERVICES is not set
593# CONFIG_HP_ILO is not set 590# CONFIG_HP_ILO is not set
594# CONFIG_ISL29003 is not set 591# CONFIG_ISL29003 is not set
592# CONFIG_SENSORS_TSL2550 is not set
595# CONFIG_DS1682 is not set 593# CONFIG_DS1682 is not set
596# CONFIG_TI_DAC7512 is not set 594# CONFIG_TI_DAC7512 is not set
597# CONFIG_C2PORT is not set 595# CONFIG_C2PORT is not set
@@ -611,6 +609,7 @@ CONFIG_HAVE_IDE=y
611# 609#
612# SCSI device support 610# SCSI device support
613# 611#
612CONFIG_SCSI_MOD=y
614# CONFIG_RAID_ATTRS is not set 613# CONFIG_RAID_ATTRS is not set
615CONFIG_SCSI=y 614CONFIG_SCSI=y
616CONFIG_SCSI_DMA=y 615CONFIG_SCSI_DMA=y
@@ -734,6 +733,7 @@ CONFIG_ATA_SFF=y
734# CONFIG_PATA_IT821X is not set 733# CONFIG_PATA_IT821X is not set
735# CONFIG_PATA_IT8213 is not set 734# CONFIG_PATA_IT8213 is not set
736# CONFIG_PATA_JMICRON is not set 735# CONFIG_PATA_JMICRON is not set
736# CONFIG_PATA_LEGACY is not set
737# CONFIG_PATA_TRIFLEX is not set 737# CONFIG_PATA_TRIFLEX is not set
738# CONFIG_PATA_MARVELL is not set 738# CONFIG_PATA_MARVELL is not set
739# CONFIG_PATA_MPIIX is not set 739# CONFIG_PATA_MPIIX is not set
@@ -836,6 +836,7 @@ CONFIG_NET_PCI=y
836# CONFIG_PCNET32 is not set 836# CONFIG_PCNET32 is not set
837# CONFIG_AMD8111_ETH is not set 837# CONFIG_AMD8111_ETH is not set
838# CONFIG_ADAPTEC_STARFIRE is not set 838# CONFIG_ADAPTEC_STARFIRE is not set
839# CONFIG_KSZ884X_PCI is not set
839# CONFIG_B44 is not set 840# CONFIG_B44 is not set
840# CONFIG_FORCEDETH is not set 841# CONFIG_FORCEDETH is not set
841CONFIG_E100=y 842CONFIG_E100=y
@@ -888,6 +889,8 @@ CONFIG_NETDEV_10000=y
888# CONFIG_CHELSIO_T1 is not set 889# CONFIG_CHELSIO_T1 is not set
889CONFIG_CHELSIO_T3_DEPENDS=y 890CONFIG_CHELSIO_T3_DEPENDS=y
890# CONFIG_CHELSIO_T3 is not set 891# CONFIG_CHELSIO_T3 is not set
892CONFIG_CHELSIO_T4_DEPENDS=y
893# CONFIG_CHELSIO_T4 is not set
891# CONFIG_ENIC is not set 894# CONFIG_ENIC is not set
892# CONFIG_IXGBE is not set 895# CONFIG_IXGBE is not set
893# CONFIG_IXGB is not set 896# CONFIG_IXGB is not set
@@ -900,6 +903,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
900# CONFIG_MLX4_CORE is not set 903# CONFIG_MLX4_CORE is not set
901# CONFIG_TEHUTI is not set 904# CONFIG_TEHUTI is not set
902# CONFIG_BNX2X is not set 905# CONFIG_BNX2X is not set
906# CONFIG_QLCNIC is not set
903# CONFIG_QLGE is not set 907# CONFIG_QLGE is not set
904# CONFIG_SFC is not set 908# CONFIG_SFC is not set
905# CONFIG_BE2NET is not set 909# CONFIG_BE2NET is not set
@@ -995,6 +999,7 @@ CONFIG_SERIAL_CORE=y
995CONFIG_SERIAL_CORE_CONSOLE=y 999CONFIG_SERIAL_CORE_CONSOLE=y
996# CONFIG_SERIAL_JSM is not set 1000# CONFIG_SERIAL_JSM is not set
997# CONFIG_SERIAL_OF_PLATFORM is not set 1001# CONFIG_SERIAL_OF_PLATFORM is not set
1002# CONFIG_SERIAL_TIMBERDALE is not set
998# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 1003# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
999CONFIG_UNIX98_PTYS=y 1004CONFIG_UNIX98_PTYS=y
1000# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1005# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -1044,6 +1049,7 @@ CONFIG_I2C_HELPER_AUTO=y
1044CONFIG_I2C_MPC=y 1049CONFIG_I2C_MPC=y
1045# CONFIG_I2C_OCORES is not set 1050# CONFIG_I2C_OCORES is not set
1046# CONFIG_I2C_SIMTEC is not set 1051# CONFIG_I2C_SIMTEC is not set
1052# CONFIG_I2C_XILINX is not set
1047 1053
1048# 1054#
1049# External I2C/SMBus adapter drivers 1055# External I2C/SMBus adapter drivers
@@ -1057,15 +1063,9 @@ CONFIG_I2C_MPC=y
1057# 1063#
1058# CONFIG_I2C_PCA_PLATFORM is not set 1064# CONFIG_I2C_PCA_PLATFORM is not set
1059# CONFIG_I2C_STUB is not set 1065# CONFIG_I2C_STUB is not set
1060
1061#
1062# Miscellaneous I2C Chip support
1063#
1064# CONFIG_SENSORS_TSL2550 is not set
1065# CONFIG_I2C_DEBUG_CORE is not set 1066# CONFIG_I2C_DEBUG_CORE is not set
1066# CONFIG_I2C_DEBUG_ALGO is not set 1067# CONFIG_I2C_DEBUG_ALGO is not set
1067# CONFIG_I2C_DEBUG_BUS is not set 1068# CONFIG_I2C_DEBUG_BUS is not set
1068# CONFIG_I2C_DEBUG_CHIP is not set
1069CONFIG_SPI=y 1069CONFIG_SPI=y
1070# CONFIG_SPI_DEBUG is not set 1070# CONFIG_SPI_DEBUG is not set
1071CONFIG_SPI_MASTER=y 1071CONFIG_SPI_MASTER=y
@@ -1108,10 +1108,11 @@ CONFIG_HWMON=y
1108# CONFIG_SENSORS_ADM1029 is not set 1108# CONFIG_SENSORS_ADM1029 is not set
1109# CONFIG_SENSORS_ADM1031 is not set 1109# CONFIG_SENSORS_ADM1031 is not set
1110# CONFIG_SENSORS_ADM9240 is not set 1110# CONFIG_SENSORS_ADM9240 is not set
1111# CONFIG_SENSORS_ADT7411 is not set
1111# CONFIG_SENSORS_ADT7462 is not set 1112# CONFIG_SENSORS_ADT7462 is not set
1112# CONFIG_SENSORS_ADT7470 is not set 1113# CONFIG_SENSORS_ADT7470 is not set
1113# CONFIG_SENSORS_ADT7473 is not set
1114# CONFIG_SENSORS_ADT7475 is not set 1114# CONFIG_SENSORS_ADT7475 is not set
1115# CONFIG_SENSORS_ASC7621 is not set
1115# CONFIG_SENSORS_ATXP1 is not set 1116# CONFIG_SENSORS_ATXP1 is not set
1116# CONFIG_SENSORS_DS1621 is not set 1117# CONFIG_SENSORS_DS1621 is not set
1117# CONFIG_SENSORS_I5K_AMB is not set 1118# CONFIG_SENSORS_I5K_AMB is not set
@@ -1150,6 +1151,7 @@ CONFIG_HWMON=y
1150# CONFIG_SENSORS_SMSC47M192 is not set 1151# CONFIG_SENSORS_SMSC47M192 is not set
1151# CONFIG_SENSORS_SMSC47B397 is not set 1152# CONFIG_SENSORS_SMSC47B397 is not set
1152# CONFIG_SENSORS_ADS7828 is not set 1153# CONFIG_SENSORS_ADS7828 is not set
1154# CONFIG_SENSORS_AMC6821 is not set
1153# CONFIG_SENSORS_THMC50 is not set 1155# CONFIG_SENSORS_THMC50 is not set
1154# CONFIG_SENSORS_TMP401 is not set 1156# CONFIG_SENSORS_TMP401 is not set
1155# CONFIG_SENSORS_TMP421 is not set 1157# CONFIG_SENSORS_TMP421 is not set
@@ -1198,21 +1200,24 @@ CONFIG_SSB_POSSIBLE=y
1198# Multifunction device drivers 1200# Multifunction device drivers
1199# 1201#
1200# CONFIG_MFD_CORE is not set 1202# CONFIG_MFD_CORE is not set
1203# CONFIG_MFD_88PM860X is not set
1201# CONFIG_MFD_SM501 is not set 1204# CONFIG_MFD_SM501 is not set
1202# CONFIG_HTC_PASIC3 is not set 1205# CONFIG_HTC_PASIC3 is not set
1203# CONFIG_TWL4030_CORE is not set 1206# CONFIG_TWL4030_CORE is not set
1204# CONFIG_MFD_TMIO is not set 1207# CONFIG_MFD_TMIO is not set
1205# CONFIG_PMIC_DA903X is not set 1208# CONFIG_PMIC_DA903X is not set
1206# CONFIG_PMIC_ADP5520 is not set 1209# CONFIG_PMIC_ADP5520 is not set
1210# CONFIG_MFD_MAX8925 is not set
1207# CONFIG_MFD_WM8400 is not set 1211# CONFIG_MFD_WM8400 is not set
1208# CONFIG_MFD_WM831X is not set 1212# CONFIG_MFD_WM831X is not set
1209# CONFIG_MFD_WM8350_I2C is not set 1213# CONFIG_MFD_WM8350_I2C is not set
1214# CONFIG_MFD_WM8994 is not set
1210# CONFIG_MFD_PCF50633 is not set 1215# CONFIG_MFD_PCF50633 is not set
1211# CONFIG_MFD_MC13783 is not set 1216# CONFIG_MFD_MC13783 is not set
1212# CONFIG_AB3100_CORE is not set 1217# CONFIG_AB3100_CORE is not set
1213# CONFIG_EZX_PCAP is not set 1218# CONFIG_EZX_PCAP is not set
1214# CONFIG_MFD_88PM8607 is not set
1215# CONFIG_AB4500_CORE is not set 1219# CONFIG_AB4500_CORE is not set
1220# CONFIG_LPC_SCH is not set
1216# CONFIG_REGULATOR is not set 1221# CONFIG_REGULATOR is not set
1217# CONFIG_MEDIA_SUPPORT is not set 1222# CONFIG_MEDIA_SUPPORT is not set
1218 1223
@@ -1221,6 +1226,7 @@ CONFIG_SSB_POSSIBLE=y
1221# 1226#
1222# CONFIG_AGP is not set 1227# CONFIG_AGP is not set
1223CONFIG_VGA_ARB=y 1228CONFIG_VGA_ARB=y
1229CONFIG_VGA_ARB_MAX_GPUS=16
1224# CONFIG_DRM is not set 1230# CONFIG_DRM is not set
1225# CONFIG_VGASTATE is not set 1231# CONFIG_VGASTATE is not set
1226CONFIG_VIDEO_OUTPUT_CONTROL=m 1232CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1353,7 +1359,6 @@ CONFIG_USB_STORAGE=y
1353# CONFIG_USB_RIO500 is not set 1359# CONFIG_USB_RIO500 is not set
1354# CONFIG_USB_LEGOTOWER is not set 1360# CONFIG_USB_LEGOTOWER is not set
1355# CONFIG_USB_LCD is not set 1361# CONFIG_USB_LCD is not set
1356# CONFIG_USB_BERRY_CHARGE is not set
1357# CONFIG_USB_LED is not set 1362# CONFIG_USB_LED is not set
1358# CONFIG_USB_CYPRESS_CY7C63 is not set 1363# CONFIG_USB_CYPRESS_CY7C63 is not set
1359# CONFIG_USB_CYTHERM is not set 1364# CONFIG_USB_CYTHERM is not set
@@ -1366,7 +1371,6 @@ CONFIG_USB_STORAGE=y
1366# CONFIG_USB_IOWARRIOR is not set 1371# CONFIG_USB_IOWARRIOR is not set
1367# CONFIG_USB_TEST is not set 1372# CONFIG_USB_TEST is not set
1368# CONFIG_USB_ISIGHTFW is not set 1373# CONFIG_USB_ISIGHTFW is not set
1369# CONFIG_USB_VST is not set
1370CONFIG_USB_GADGET=y 1374CONFIG_USB_GADGET=y
1371# CONFIG_USB_GADGET_DEBUG is not set 1375# CONFIG_USB_GADGET_DEBUG is not set
1372# CONFIG_USB_GADGET_DEBUG_FILES is not set 1376# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1405,6 +1409,7 @@ CONFIG_USB_ETH_RNDIS=y
1405# CONFIG_USB_MIDI_GADGET is not set 1409# CONFIG_USB_MIDI_GADGET is not set
1406# CONFIG_USB_G_PRINTER is not set 1410# CONFIG_USB_G_PRINTER is not set
1407# CONFIG_USB_CDC_COMPOSITE is not set 1411# CONFIG_USB_CDC_COMPOSITE is not set
1412# CONFIG_USB_G_NOKIA is not set
1408# CONFIG_USB_G_MULTI is not set 1413# CONFIG_USB_G_MULTI is not set
1409 1414
1410# 1415#
@@ -1575,6 +1580,7 @@ CONFIG_JFFS2_ZLIB=y
1575# CONFIG_JFFS2_LZO is not set 1580# CONFIG_JFFS2_LZO is not set
1576CONFIG_JFFS2_RTIME=y 1581CONFIG_JFFS2_RTIME=y
1577# CONFIG_JFFS2_RUBIN is not set 1582# CONFIG_JFFS2_RUBIN is not set
1583# CONFIG_LOGFS is not set
1578# CONFIG_CRAMFS is not set 1584# CONFIG_CRAMFS is not set
1579# CONFIG_SQUASHFS is not set 1585# CONFIG_SQUASHFS is not set
1580# CONFIG_VXFS_FS is not set 1586# CONFIG_VXFS_FS is not set
@@ -1601,6 +1607,7 @@ CONFIG_SUNRPC_GSS=y
1601CONFIG_RPCSEC_GSS_KRB5=y 1607CONFIG_RPCSEC_GSS_KRB5=y
1602# CONFIG_RPCSEC_GSS_SPKM3 is not set 1608# CONFIG_RPCSEC_GSS_SPKM3 is not set
1603# CONFIG_SMB_FS is not set 1609# CONFIG_SMB_FS is not set
1610# CONFIG_CEPH_FS is not set
1604# CONFIG_CIFS is not set 1611# CONFIG_CIFS is not set
1605# CONFIG_NCP_FS is not set 1612# CONFIG_NCP_FS is not set
1606# CONFIG_CODA_FS is not set 1613# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index 70ba9ba15b72..74cb27aa9d17 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:17 2010 4# Mon Apr 19 23:16:41 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100# CONFIG_FAIR_GROUP_SCHED is not set
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -324,6 +320,7 @@ CONFIG_ISA_DMA_API=y
324# Bus options 320# Bus options
325# 321#
326CONFIG_ZONE_DMA=y 322CONFIG_ZONE_DMA=y
323# CONFIG_NEED_DMA_MAP_STATE is not set
327CONFIG_GENERIC_ISA_DMA=y 324CONFIG_GENERIC_ISA_DMA=y
328CONFIG_PPC_INDIRECT_PCI=y 325CONFIG_PPC_INDIRECT_PCI=y
329CONFIG_FSL_SOC=y 326CONFIG_FSL_SOC=y
@@ -335,7 +332,6 @@ CONFIG_PCI_SYSCALL=y
335# CONFIG_PCIEPORTBUS is not set 332# CONFIG_PCIEPORTBUS is not set
336CONFIG_ARCH_SUPPORTS_MSI=y 333CONFIG_ARCH_SUPPORTS_MSI=y
337# CONFIG_PCI_MSI is not set 334# CONFIG_PCI_MSI is not set
338# CONFIG_PCI_LEGACY is not set
339# CONFIG_PCI_STUB is not set 335# CONFIG_PCI_STUB is not set
340# CONFIG_PCI_IOV is not set 336# CONFIG_PCI_IOV is not set
341# CONFIG_PCCARD is not set 337# CONFIG_PCCARD is not set
@@ -361,7 +357,6 @@ CONFIG_NET=y
361# Networking options 357# Networking options
362# 358#
363CONFIG_PACKET=y 359CONFIG_PACKET=y
364# CONFIG_PACKET_MMAP is not set
365CONFIG_UNIX=y 360CONFIG_UNIX=y
366CONFIG_XFRM=y 361CONFIG_XFRM=y
367# CONFIG_XFRM_USER is not set 362# CONFIG_XFRM_USER is not set
@@ -456,6 +451,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
456# CONFIG_SYS_HYPERVISOR is not set 451# CONFIG_SYS_HYPERVISOR is not set
457# CONFIG_CONNECTOR is not set 452# CONFIG_CONNECTOR is not set
458# CONFIG_MTD is not set 453# CONFIG_MTD is not set
454CONFIG_OF_FLATTREE=y
455CONFIG_OF_DYNAMIC=y
459CONFIG_OF_DEVICE=y 456CONFIG_OF_DEVICE=y
460CONFIG_OF_I2C=y 457CONFIG_OF_I2C=y
461CONFIG_OF_MDIO=y 458CONFIG_OF_MDIO=y
@@ -491,6 +488,7 @@ CONFIG_MISC_DEVICES=y
491# CONFIG_ENCLOSURE_SERVICES is not set 488# CONFIG_ENCLOSURE_SERVICES is not set
492# CONFIG_HP_ILO is not set 489# CONFIG_HP_ILO is not set
493# CONFIG_ISL29003 is not set 490# CONFIG_ISL29003 is not set
491# CONFIG_SENSORS_TSL2550 is not set
494# CONFIG_DS1682 is not set 492# CONFIG_DS1682 is not set
495# CONFIG_C2PORT is not set 493# CONFIG_C2PORT is not set
496 494
@@ -508,6 +506,7 @@ CONFIG_HAVE_IDE=y
508# 506#
509# SCSI device support 507# SCSI device support
510# 508#
509CONFIG_SCSI_MOD=y
511# CONFIG_RAID_ATTRS is not set 510# CONFIG_RAID_ATTRS is not set
512CONFIG_SCSI=y 511CONFIG_SCSI=y
513CONFIG_SCSI_DMA=y 512CONFIG_SCSI_DMA=y
@@ -692,6 +691,8 @@ CONFIG_NETDEV_10000=y
692# CONFIG_CHELSIO_T1 is not set 691# CONFIG_CHELSIO_T1 is not set
693CONFIG_CHELSIO_T3_DEPENDS=y 692CONFIG_CHELSIO_T3_DEPENDS=y
694# CONFIG_CHELSIO_T3 is not set 693# CONFIG_CHELSIO_T3 is not set
694CONFIG_CHELSIO_T4_DEPENDS=y
695# CONFIG_CHELSIO_T4 is not set
695# CONFIG_ENIC is not set 696# CONFIG_ENIC is not set
696# CONFIG_IXGBE is not set 697# CONFIG_IXGBE is not set
697# CONFIG_IXGB is not set 698# CONFIG_IXGB is not set
@@ -704,6 +705,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
704# CONFIG_MLX4_CORE is not set 705# CONFIG_MLX4_CORE is not set
705# CONFIG_TEHUTI is not set 706# CONFIG_TEHUTI is not set
706# CONFIG_BNX2X is not set 707# CONFIG_BNX2X is not set
708# CONFIG_QLCNIC is not set
707# CONFIG_QLGE is not set 709# CONFIG_QLGE is not set
708# CONFIG_SFC is not set 710# CONFIG_SFC is not set
709# CONFIG_BE2NET is not set 711# CONFIG_BE2NET is not set
@@ -789,6 +791,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
789# CONFIG_SERIAL_JSM is not set 791# CONFIG_SERIAL_JSM is not set
790# CONFIG_SERIAL_OF_PLATFORM is not set 792# CONFIG_SERIAL_OF_PLATFORM is not set
791# CONFIG_SERIAL_QE is not set 793# CONFIG_SERIAL_QE is not set
794# CONFIG_SERIAL_TIMBERDALE is not set
792# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 795# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
793CONFIG_UNIX98_PTYS=y 796CONFIG_UNIX98_PTYS=y
794# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 797# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -838,6 +841,7 @@ CONFIG_I2C_HELPER_AUTO=y
838CONFIG_I2C_MPC=y 841CONFIG_I2C_MPC=y
839# CONFIG_I2C_OCORES is not set 842# CONFIG_I2C_OCORES is not set
840# CONFIG_I2C_SIMTEC is not set 843# CONFIG_I2C_SIMTEC is not set
844# CONFIG_I2C_XILINX is not set
841 845
842# 846#
843# External I2C/SMBus adapter drivers 847# External I2C/SMBus adapter drivers
@@ -850,15 +854,9 @@ CONFIG_I2C_MPC=y
850# 854#
851# CONFIG_I2C_PCA_PLATFORM is not set 855# CONFIG_I2C_PCA_PLATFORM is not set
852# CONFIG_I2C_STUB is not set 856# CONFIG_I2C_STUB is not set
853
854#
855# Miscellaneous I2C Chip support
856#
857# CONFIG_SENSORS_TSL2550 is not set
858# CONFIG_I2C_DEBUG_CORE is not set 857# CONFIG_I2C_DEBUG_CORE is not set
859# CONFIG_I2C_DEBUG_ALGO is not set 858# CONFIG_I2C_DEBUG_ALGO is not set
860# CONFIG_I2C_DEBUG_BUS is not set 859# CONFIG_I2C_DEBUG_BUS is not set
861# CONFIG_I2C_DEBUG_CHIP is not set
862# CONFIG_SPI is not set 860# CONFIG_SPI is not set
863 861
864# 862#
@@ -884,10 +882,11 @@ CONFIG_HWMON=y
884# CONFIG_SENSORS_ADM1029 is not set 882# CONFIG_SENSORS_ADM1029 is not set
885# CONFIG_SENSORS_ADM1031 is not set 883# CONFIG_SENSORS_ADM1031 is not set
886# CONFIG_SENSORS_ADM9240 is not set 884# CONFIG_SENSORS_ADM9240 is not set
885# CONFIG_SENSORS_ADT7411 is not set
887# CONFIG_SENSORS_ADT7462 is not set 886# CONFIG_SENSORS_ADT7462 is not set
888# CONFIG_SENSORS_ADT7470 is not set 887# CONFIG_SENSORS_ADT7470 is not set
889# CONFIG_SENSORS_ADT7473 is not set
890# CONFIG_SENSORS_ADT7475 is not set 888# CONFIG_SENSORS_ADT7475 is not set
889# CONFIG_SENSORS_ASC7621 is not set
891# CONFIG_SENSORS_ATXP1 is not set 890# CONFIG_SENSORS_ATXP1 is not set
892# CONFIG_SENSORS_DS1621 is not set 891# CONFIG_SENSORS_DS1621 is not set
893# CONFIG_SENSORS_I5K_AMB is not set 892# CONFIG_SENSORS_I5K_AMB is not set
@@ -924,6 +923,7 @@ CONFIG_HWMON=y
924# CONFIG_SENSORS_SMSC47M192 is not set 923# CONFIG_SENSORS_SMSC47M192 is not set
925# CONFIG_SENSORS_SMSC47B397 is not set 924# CONFIG_SENSORS_SMSC47B397 is not set
926# CONFIG_SENSORS_ADS7828 is not set 925# CONFIG_SENSORS_ADS7828 is not set
926# CONFIG_SENSORS_AMC6821 is not set
927# CONFIG_SENSORS_THMC50 is not set 927# CONFIG_SENSORS_THMC50 is not set
928# CONFIG_SENSORS_TMP401 is not set 928# CONFIG_SENSORS_TMP401 is not set
929# CONFIG_SENSORS_TMP421 is not set 929# CONFIG_SENSORS_TMP421 is not set
@@ -966,18 +966,21 @@ CONFIG_SSB_POSSIBLE=y
966# Multifunction device drivers 966# Multifunction device drivers
967# 967#
968# CONFIG_MFD_CORE is not set 968# CONFIG_MFD_CORE is not set
969# CONFIG_MFD_88PM860X is not set
969# CONFIG_MFD_SM501 is not set 970# CONFIG_MFD_SM501 is not set
970# CONFIG_HTC_PASIC3 is not set 971# CONFIG_HTC_PASIC3 is not set
971# CONFIG_TWL4030_CORE is not set 972# CONFIG_TWL4030_CORE is not set
972# CONFIG_MFD_TMIO is not set 973# CONFIG_MFD_TMIO is not set
973# CONFIG_PMIC_DA903X is not set 974# CONFIG_PMIC_DA903X is not set
974# CONFIG_PMIC_ADP5520 is not set 975# CONFIG_PMIC_ADP5520 is not set
976# CONFIG_MFD_MAX8925 is not set
975# CONFIG_MFD_WM8400 is not set 977# CONFIG_MFD_WM8400 is not set
976# CONFIG_MFD_WM831X is not set 978# CONFIG_MFD_WM831X is not set
977# CONFIG_MFD_WM8350_I2C is not set 979# CONFIG_MFD_WM8350_I2C is not set
980# CONFIG_MFD_WM8994 is not set
978# CONFIG_MFD_PCF50633 is not set 981# CONFIG_MFD_PCF50633 is not set
979# CONFIG_AB3100_CORE is not set 982# CONFIG_AB3100_CORE is not set
980# CONFIG_MFD_88PM8607 is not set 983# CONFIG_LPC_SCH is not set
981# CONFIG_REGULATOR is not set 984# CONFIG_REGULATOR is not set
982# CONFIG_MEDIA_SUPPORT is not set 985# CONFIG_MEDIA_SUPPORT is not set
983 986
@@ -986,6 +989,7 @@ CONFIG_SSB_POSSIBLE=y
986# 989#
987# CONFIG_AGP is not set 990# CONFIG_AGP is not set
988CONFIG_VGA_ARB=y 991CONFIG_VGA_ARB=y
992CONFIG_VGA_ARB_MAX_GPUS=16
989# CONFIG_DRM is not set 993# CONFIG_DRM is not set
990# CONFIG_VGASTATE is not set 994# CONFIG_VGASTATE is not set
991CONFIG_VIDEO_OUTPUT_CONTROL=m 995CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1170,6 +1174,7 @@ CONFIG_MISC_FILESYSTEMS=y
1170# CONFIG_BEFS_FS is not set 1174# CONFIG_BEFS_FS is not set
1171# CONFIG_BFS_FS is not set 1175# CONFIG_BFS_FS is not set
1172# CONFIG_EFS_FS is not set 1176# CONFIG_EFS_FS is not set
1177# CONFIG_LOGFS is not set
1173# CONFIG_CRAMFS is not set 1178# CONFIG_CRAMFS is not set
1174# CONFIG_SQUASHFS is not set 1179# CONFIG_SQUASHFS is not set
1175# CONFIG_VXFS_FS is not set 1180# CONFIG_VXFS_FS is not set
@@ -1196,6 +1201,7 @@ CONFIG_SUNRPC_GSS=y
1196CONFIG_RPCSEC_GSS_KRB5=y 1201CONFIG_RPCSEC_GSS_KRB5=y
1197# CONFIG_RPCSEC_GSS_SPKM3 is not set 1202# CONFIG_RPCSEC_GSS_SPKM3 is not set
1198# CONFIG_SMB_FS is not set 1203# CONFIG_SMB_FS is not set
1204# CONFIG_CEPH_FS is not set
1199# CONFIG_CIFS is not set 1205# CONFIG_CIFS is not set
1200# CONFIG_NCP_FS is not set 1206# CONFIG_NCP_FS is not set
1201# CONFIG_CODA_FS is not set 1207# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 5f3ec868e97b..10412a9c7f90 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:18 2010 4# Mon Apr 19 23:16:42 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100# CONFIG_FAIR_GROUP_SCHED is not set
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -324,6 +320,7 @@ CONFIG_ISA_DMA_API=y
324# Bus options 320# Bus options
325# 321#
326CONFIG_ZONE_DMA=y 322CONFIG_ZONE_DMA=y
323# CONFIG_NEED_DMA_MAP_STATE is not set
327CONFIG_GENERIC_ISA_DMA=y 324CONFIG_GENERIC_ISA_DMA=y
328CONFIG_PPC_INDIRECT_PCI=y 325CONFIG_PPC_INDIRECT_PCI=y
329CONFIG_FSL_SOC=y 326CONFIG_FSL_SOC=y
@@ -335,7 +332,6 @@ CONFIG_PCI_SYSCALL=y
335# CONFIG_PCIEPORTBUS is not set 332# CONFIG_PCIEPORTBUS is not set
336CONFIG_ARCH_SUPPORTS_MSI=y 333CONFIG_ARCH_SUPPORTS_MSI=y
337# CONFIG_PCI_MSI is not set 334# CONFIG_PCI_MSI is not set
338# CONFIG_PCI_LEGACY is not set
339# CONFIG_PCI_STUB is not set 335# CONFIG_PCI_STUB is not set
340# CONFIG_PCI_IOV is not set 336# CONFIG_PCI_IOV is not set
341# CONFIG_PCCARD is not set 337# CONFIG_PCCARD is not set
@@ -361,7 +357,6 @@ CONFIG_NET=y
361# Networking options 357# Networking options
362# 358#
363CONFIG_PACKET=y 359CONFIG_PACKET=y
364# CONFIG_PACKET_MMAP is not set
365CONFIG_UNIX=y 360CONFIG_UNIX=y
366CONFIG_XFRM=y 361CONFIG_XFRM=y
367# CONFIG_XFRM_USER is not set 362# CONFIG_XFRM_USER is not set
@@ -456,6 +451,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
456# CONFIG_SYS_HYPERVISOR is not set 451# CONFIG_SYS_HYPERVISOR is not set
457# CONFIG_CONNECTOR is not set 452# CONFIG_CONNECTOR is not set
458# CONFIG_MTD is not set 453# CONFIG_MTD is not set
454CONFIG_OF_FLATTREE=y
455CONFIG_OF_DYNAMIC=y
459CONFIG_OF_DEVICE=y 456CONFIG_OF_DEVICE=y
460CONFIG_OF_I2C=y 457CONFIG_OF_I2C=y
461CONFIG_OF_SPI=y 458CONFIG_OF_SPI=y
@@ -493,6 +490,7 @@ CONFIG_MISC_DEVICES=y
493# CONFIG_ENCLOSURE_SERVICES is not set 490# CONFIG_ENCLOSURE_SERVICES is not set
494# CONFIG_HP_ILO is not set 491# CONFIG_HP_ILO is not set
495# CONFIG_ISL29003 is not set 492# CONFIG_ISL29003 is not set
493# CONFIG_SENSORS_TSL2550 is not set
496# CONFIG_DS1682 is not set 494# CONFIG_DS1682 is not set
497# CONFIG_TI_DAC7512 is not set 495# CONFIG_TI_DAC7512 is not set
498# CONFIG_C2PORT is not set 496# CONFIG_C2PORT is not set
@@ -513,6 +511,7 @@ CONFIG_HAVE_IDE=y
513# 511#
514# SCSI device support 512# SCSI device support
515# 513#
514CONFIG_SCSI_MOD=y
516# CONFIG_RAID_ATTRS is not set 515# CONFIG_RAID_ATTRS is not set
517CONFIG_SCSI=y 516CONFIG_SCSI=y
518CONFIG_SCSI_DMA=y 517CONFIG_SCSI_DMA=y
@@ -699,6 +698,8 @@ CONFIG_NETDEV_10000=y
699# CONFIG_CHELSIO_T1 is not set 698# CONFIG_CHELSIO_T1 is not set
700CONFIG_CHELSIO_T3_DEPENDS=y 699CONFIG_CHELSIO_T3_DEPENDS=y
701# CONFIG_CHELSIO_T3 is not set 700# CONFIG_CHELSIO_T3 is not set
701CONFIG_CHELSIO_T4_DEPENDS=y
702# CONFIG_CHELSIO_T4 is not set
702# CONFIG_ENIC is not set 703# CONFIG_ENIC is not set
703# CONFIG_IXGBE is not set 704# CONFIG_IXGBE is not set
704# CONFIG_IXGB is not set 705# CONFIG_IXGB is not set
@@ -711,6 +712,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
711# CONFIG_MLX4_CORE is not set 712# CONFIG_MLX4_CORE is not set
712# CONFIG_TEHUTI is not set 713# CONFIG_TEHUTI is not set
713# CONFIG_BNX2X is not set 714# CONFIG_BNX2X is not set
715# CONFIG_QLCNIC is not set
714# CONFIG_QLGE is not set 716# CONFIG_QLGE is not set
715# CONFIG_SFC is not set 717# CONFIG_SFC is not set
716# CONFIG_BE2NET is not set 718# CONFIG_BE2NET is not set
@@ -807,6 +809,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
807# CONFIG_SERIAL_JSM is not set 809# CONFIG_SERIAL_JSM is not set
808# CONFIG_SERIAL_OF_PLATFORM is not set 810# CONFIG_SERIAL_OF_PLATFORM is not set
809# CONFIG_SERIAL_QE is not set 811# CONFIG_SERIAL_QE is not set
812# CONFIG_SERIAL_TIMBERDALE is not set
810# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 813# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
811CONFIG_UNIX98_PTYS=y 814CONFIG_UNIX98_PTYS=y
812# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 815# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -858,6 +861,7 @@ CONFIG_I2C_HELPER_AUTO=y
858CONFIG_I2C_MPC=y 861CONFIG_I2C_MPC=y
859# CONFIG_I2C_OCORES is not set 862# CONFIG_I2C_OCORES is not set
860# CONFIG_I2C_SIMTEC is not set 863# CONFIG_I2C_SIMTEC is not set
864# CONFIG_I2C_XILINX is not set
861 865
862# 866#
863# External I2C/SMBus adapter drivers 867# External I2C/SMBus adapter drivers
@@ -871,15 +875,9 @@ CONFIG_I2C_MPC=y
871# 875#
872# CONFIG_I2C_PCA_PLATFORM is not set 876# CONFIG_I2C_PCA_PLATFORM is not set
873# CONFIG_I2C_STUB is not set 877# CONFIG_I2C_STUB is not set
874
875#
876# Miscellaneous I2C Chip support
877#
878# CONFIG_SENSORS_TSL2550 is not set
879# CONFIG_I2C_DEBUG_CORE is not set 878# CONFIG_I2C_DEBUG_CORE is not set
880# CONFIG_I2C_DEBUG_ALGO is not set 879# CONFIG_I2C_DEBUG_ALGO is not set
881# CONFIG_I2C_DEBUG_BUS is not set 880# CONFIG_I2C_DEBUG_BUS is not set
882# CONFIG_I2C_DEBUG_CHIP is not set
883CONFIG_SPI=y 881CONFIG_SPI=y
884CONFIG_SPI_MASTER=y 882CONFIG_SPI_MASTER=y
885 883
@@ -921,10 +919,11 @@ CONFIG_HWMON=y
921# CONFIG_SENSORS_ADM1029 is not set 919# CONFIG_SENSORS_ADM1029 is not set
922# CONFIG_SENSORS_ADM1031 is not set 920# CONFIG_SENSORS_ADM1031 is not set
923# CONFIG_SENSORS_ADM9240 is not set 921# CONFIG_SENSORS_ADM9240 is not set
922# CONFIG_SENSORS_ADT7411 is not set
924# CONFIG_SENSORS_ADT7462 is not set 923# CONFIG_SENSORS_ADT7462 is not set
925# CONFIG_SENSORS_ADT7470 is not set 924# CONFIG_SENSORS_ADT7470 is not set
926# CONFIG_SENSORS_ADT7473 is not set
927# CONFIG_SENSORS_ADT7475 is not set 925# CONFIG_SENSORS_ADT7475 is not set
926# CONFIG_SENSORS_ASC7621 is not set
928# CONFIG_SENSORS_ATXP1 is not set 927# CONFIG_SENSORS_ATXP1 is not set
929# CONFIG_SENSORS_DS1621 is not set 928# CONFIG_SENSORS_DS1621 is not set
930# CONFIG_SENSORS_I5K_AMB is not set 929# CONFIG_SENSORS_I5K_AMB is not set
@@ -963,6 +962,7 @@ CONFIG_HWMON=y
963# CONFIG_SENSORS_SMSC47M192 is not set 962# CONFIG_SENSORS_SMSC47M192 is not set
964# CONFIG_SENSORS_SMSC47B397 is not set 963# CONFIG_SENSORS_SMSC47B397 is not set
965# CONFIG_SENSORS_ADS7828 is not set 964# CONFIG_SENSORS_ADS7828 is not set
965# CONFIG_SENSORS_AMC6821 is not set
966# CONFIG_SENSORS_THMC50 is not set 966# CONFIG_SENSORS_THMC50 is not set
967# CONFIG_SENSORS_TMP401 is not set 967# CONFIG_SENSORS_TMP401 is not set
968# CONFIG_SENSORS_TMP421 is not set 968# CONFIG_SENSORS_TMP421 is not set
@@ -1011,21 +1011,24 @@ CONFIG_SSB_POSSIBLE=y
1011# Multifunction device drivers 1011# Multifunction device drivers
1012# 1012#
1013# CONFIG_MFD_CORE is not set 1013# CONFIG_MFD_CORE is not set
1014# CONFIG_MFD_88PM860X is not set
1014# CONFIG_MFD_SM501 is not set 1015# CONFIG_MFD_SM501 is not set
1015# CONFIG_HTC_PASIC3 is not set 1016# CONFIG_HTC_PASIC3 is not set
1016# CONFIG_TWL4030_CORE is not set 1017# CONFIG_TWL4030_CORE is not set
1017# CONFIG_MFD_TMIO is not set 1018# CONFIG_MFD_TMIO is not set
1018# CONFIG_PMIC_DA903X is not set 1019# CONFIG_PMIC_DA903X is not set
1019# CONFIG_PMIC_ADP5520 is not set 1020# CONFIG_PMIC_ADP5520 is not set
1021# CONFIG_MFD_MAX8925 is not set
1020# CONFIG_MFD_WM8400 is not set 1022# CONFIG_MFD_WM8400 is not set
1021# CONFIG_MFD_WM831X is not set 1023# CONFIG_MFD_WM831X is not set
1022# CONFIG_MFD_WM8350_I2C is not set 1024# CONFIG_MFD_WM8350_I2C is not set
1025# CONFIG_MFD_WM8994 is not set
1023# CONFIG_MFD_PCF50633 is not set 1026# CONFIG_MFD_PCF50633 is not set
1024# CONFIG_MFD_MC13783 is not set 1027# CONFIG_MFD_MC13783 is not set
1025# CONFIG_AB3100_CORE is not set 1028# CONFIG_AB3100_CORE is not set
1026# CONFIG_EZX_PCAP is not set 1029# CONFIG_EZX_PCAP is not set
1027# CONFIG_MFD_88PM8607 is not set
1028# CONFIG_AB4500_CORE is not set 1030# CONFIG_AB4500_CORE is not set
1031# CONFIG_LPC_SCH is not set
1029# CONFIG_REGULATOR is not set 1032# CONFIG_REGULATOR is not set
1030# CONFIG_MEDIA_SUPPORT is not set 1033# CONFIG_MEDIA_SUPPORT is not set
1031 1034
@@ -1034,6 +1037,7 @@ CONFIG_SSB_POSSIBLE=y
1034# 1037#
1035# CONFIG_AGP is not set 1038# CONFIG_AGP is not set
1036CONFIG_VGA_ARB=y 1039CONFIG_VGA_ARB=y
1040CONFIG_VGA_ARB_MAX_GPUS=16
1037# CONFIG_DRM is not set 1041# CONFIG_DRM is not set
1038# CONFIG_VGASTATE is not set 1042# CONFIG_VGASTATE is not set
1039CONFIG_VIDEO_OUTPUT_CONTROL=m 1043CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1165,7 +1169,6 @@ CONFIG_USB_STORAGE=y
1165# CONFIG_USB_RIO500 is not set 1169# CONFIG_USB_RIO500 is not set
1166# CONFIG_USB_LEGOTOWER is not set 1170# CONFIG_USB_LEGOTOWER is not set
1167# CONFIG_USB_LCD is not set 1171# CONFIG_USB_LCD is not set
1168# CONFIG_USB_BERRY_CHARGE is not set
1169# CONFIG_USB_LED is not set 1172# CONFIG_USB_LED is not set
1170# CONFIG_USB_CYPRESS_CY7C63 is not set 1173# CONFIG_USB_CYPRESS_CY7C63 is not set
1171# CONFIG_USB_CYTHERM is not set 1174# CONFIG_USB_CYTHERM is not set
@@ -1178,7 +1181,6 @@ CONFIG_USB_STORAGE=y
1178# CONFIG_USB_IOWARRIOR is not set 1181# CONFIG_USB_IOWARRIOR is not set
1179# CONFIG_USB_TEST is not set 1182# CONFIG_USB_TEST is not set
1180# CONFIG_USB_ISIGHTFW is not set 1183# CONFIG_USB_ISIGHTFW is not set
1181# CONFIG_USB_VST is not set
1182# CONFIG_USB_GADGET is not set 1184# CONFIG_USB_GADGET is not set
1183 1185
1184# 1186#
@@ -1203,8 +1205,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1203# 1205#
1204# CONFIG_MMC_SDHCI is not set 1206# CONFIG_MMC_SDHCI is not set
1205# CONFIG_MMC_WBSD is not set 1207# CONFIG_MMC_WBSD is not set
1206# CONFIG_MMC_AT91 is not set
1207# CONFIG_MMC_ATMELMCI is not set
1208# CONFIG_MMC_TIFM_SD is not set 1208# CONFIG_MMC_TIFM_SD is not set
1209CONFIG_MMC_SPI=y 1209CONFIG_MMC_SPI=y
1210# CONFIG_MMC_CB710 is not set 1210# CONFIG_MMC_CB710 is not set
@@ -1297,6 +1297,7 @@ CONFIG_MISC_FILESYSTEMS=y
1297# CONFIG_BEFS_FS is not set 1297# CONFIG_BEFS_FS is not set
1298# CONFIG_BFS_FS is not set 1298# CONFIG_BFS_FS is not set
1299# CONFIG_EFS_FS is not set 1299# CONFIG_EFS_FS is not set
1300# CONFIG_LOGFS is not set
1300# CONFIG_CRAMFS is not set 1301# CONFIG_CRAMFS is not set
1301# CONFIG_SQUASHFS is not set 1302# CONFIG_SQUASHFS is not set
1302# CONFIG_VXFS_FS is not set 1303# CONFIG_VXFS_FS is not set
@@ -1323,6 +1324,7 @@ CONFIG_SUNRPC_GSS=y
1323CONFIG_RPCSEC_GSS_KRB5=y 1324CONFIG_RPCSEC_GSS_KRB5=y
1324# CONFIG_RPCSEC_GSS_SPKM3 is not set 1325# CONFIG_RPCSEC_GSS_SPKM3 is not set
1325# CONFIG_SMB_FS is not set 1326# CONFIG_SMB_FS is not set
1327# CONFIG_CEPH_FS is not set
1326# CONFIG_CIFS is not set 1328# CONFIG_CIFS is not set
1327# CONFIG_NCP_FS is not set 1329# CONFIG_NCP_FS is not set
1328# CONFIG_CODA_FS is not set 1330# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 69caccea5a68..7b31fc3f3545 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:19 2010 4# Mon Apr 19 23:16:43 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100# CONFIG_FAIR_GROUP_SCHED is not set
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -323,6 +319,7 @@ CONFIG_ISA_DMA_API=y
323# Bus options 319# Bus options
324# 320#
325CONFIG_ZONE_DMA=y 321CONFIG_ZONE_DMA=y
322# CONFIG_NEED_DMA_MAP_STATE is not set
326CONFIG_GENERIC_ISA_DMA=y 323CONFIG_GENERIC_ISA_DMA=y
327CONFIG_PPC_INDIRECT_PCI=y 324CONFIG_PPC_INDIRECT_PCI=y
328CONFIG_FSL_SOC=y 325CONFIG_FSL_SOC=y
@@ -334,7 +331,6 @@ CONFIG_PCI_SYSCALL=y
334# CONFIG_PCIEPORTBUS is not set 331# CONFIG_PCIEPORTBUS is not set
335CONFIG_ARCH_SUPPORTS_MSI=y 332CONFIG_ARCH_SUPPORTS_MSI=y
336# CONFIG_PCI_MSI is not set 333# CONFIG_PCI_MSI is not set
337# CONFIG_PCI_LEGACY is not set
338# CONFIG_PCI_STUB is not set 334# CONFIG_PCI_STUB is not set
339# CONFIG_PCI_IOV is not set 335# CONFIG_PCI_IOV is not set
340# CONFIG_PCCARD is not set 336# CONFIG_PCCARD is not set
@@ -360,7 +356,6 @@ CONFIG_NET=y
360# Networking options 356# Networking options
361# 357#
362CONFIG_PACKET=y 358CONFIG_PACKET=y
363# CONFIG_PACKET_MMAP is not set
364CONFIG_UNIX=y 359CONFIG_UNIX=y
365CONFIG_XFRM=y 360CONFIG_XFRM=y
366# CONFIG_XFRM_USER is not set 361# CONFIG_XFRM_USER is not set
@@ -539,6 +534,8 @@ CONFIG_MTD_PHYSMAP=y
539# UBI - Unsorted block images 534# UBI - Unsorted block images
540# 535#
541# CONFIG_MTD_UBI is not set 536# CONFIG_MTD_UBI is not set
537CONFIG_OF_FLATTREE=y
538CONFIG_OF_DYNAMIC=y
542CONFIG_OF_DEVICE=y 539CONFIG_OF_DEVICE=y
543CONFIG_OF_I2C=y 540CONFIG_OF_I2C=y
544CONFIG_OF_SPI=y 541CONFIG_OF_SPI=y
@@ -576,6 +573,7 @@ CONFIG_MISC_DEVICES=y
576# CONFIG_ENCLOSURE_SERVICES is not set 573# CONFIG_ENCLOSURE_SERVICES is not set
577# CONFIG_HP_ILO is not set 574# CONFIG_HP_ILO is not set
578# CONFIG_ISL29003 is not set 575# CONFIG_ISL29003 is not set
576# CONFIG_SENSORS_TSL2550 is not set
579# CONFIG_DS1682 is not set 577# CONFIG_DS1682 is not set
580# CONFIG_TI_DAC7512 is not set 578# CONFIG_TI_DAC7512 is not set
581# CONFIG_C2PORT is not set 579# CONFIG_C2PORT is not set
@@ -643,6 +641,7 @@ CONFIG_IDE_PROC_FS=y
643# 641#
644# SCSI device support 642# SCSI device support
645# 643#
644CONFIG_SCSI_MOD=y
646# CONFIG_RAID_ATTRS is not set 645# CONFIG_RAID_ATTRS is not set
647CONFIG_SCSI=y 646CONFIG_SCSI=y
648CONFIG_SCSI_DMA=y 647CONFIG_SCSI_DMA=y
@@ -766,6 +765,7 @@ CONFIG_SATA_SIL=y
766# CONFIG_PATA_IT821X is not set 765# CONFIG_PATA_IT821X is not set
767# CONFIG_PATA_IT8213 is not set 766# CONFIG_PATA_IT8213 is not set
768# CONFIG_PATA_JMICRON is not set 767# CONFIG_PATA_JMICRON is not set
768# CONFIG_PATA_LEGACY is not set
769# CONFIG_PATA_TRIFLEX is not set 769# CONFIG_PATA_TRIFLEX is not set
770# CONFIG_PATA_MARVELL is not set 770# CONFIG_PATA_MARVELL is not set
771# CONFIG_PATA_MPIIX is not set 771# CONFIG_PATA_MPIIX is not set
@@ -879,6 +879,8 @@ CONFIG_NETDEV_10000=y
879# CONFIG_CHELSIO_T1 is not set 879# CONFIG_CHELSIO_T1 is not set
880CONFIG_CHELSIO_T3_DEPENDS=y 880CONFIG_CHELSIO_T3_DEPENDS=y
881# CONFIG_CHELSIO_T3 is not set 881# CONFIG_CHELSIO_T3 is not set
882CONFIG_CHELSIO_T4_DEPENDS=y
883# CONFIG_CHELSIO_T4 is not set
882# CONFIG_ENIC is not set 884# CONFIG_ENIC is not set
883# CONFIG_IXGBE is not set 885# CONFIG_IXGBE is not set
884# CONFIG_IXGB is not set 886# CONFIG_IXGB is not set
@@ -891,6 +893,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
891# CONFIG_MLX4_CORE is not set 893# CONFIG_MLX4_CORE is not set
892# CONFIG_TEHUTI is not set 894# CONFIG_TEHUTI is not set
893# CONFIG_BNX2X is not set 895# CONFIG_BNX2X is not set
896# CONFIG_QLCNIC is not set
894# CONFIG_QLGE is not set 897# CONFIG_QLGE is not set
895# CONFIG_SFC is not set 898# CONFIG_SFC is not set
896# CONFIG_BE2NET is not set 899# CONFIG_BE2NET is not set
@@ -965,6 +968,7 @@ CONFIG_SERIAL_CORE=y
965CONFIG_SERIAL_CORE_CONSOLE=y 968CONFIG_SERIAL_CORE_CONSOLE=y
966# CONFIG_SERIAL_JSM is not set 969# CONFIG_SERIAL_JSM is not set
967# CONFIG_SERIAL_OF_PLATFORM is not set 970# CONFIG_SERIAL_OF_PLATFORM is not set
971# CONFIG_SERIAL_TIMBERDALE is not set
968# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 972# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
969CONFIG_UNIX98_PTYS=y 973CONFIG_UNIX98_PTYS=y
970# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 974# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -1014,6 +1018,7 @@ CONFIG_I2C_HELPER_AUTO=y
1014CONFIG_I2C_MPC=y 1018CONFIG_I2C_MPC=y
1015# CONFIG_I2C_OCORES is not set 1019# CONFIG_I2C_OCORES is not set
1016# CONFIG_I2C_SIMTEC is not set 1020# CONFIG_I2C_SIMTEC is not set
1021# CONFIG_I2C_XILINX is not set
1017 1022
1018# 1023#
1019# External I2C/SMBus adapter drivers 1024# External I2C/SMBus adapter drivers
@@ -1027,15 +1032,9 @@ CONFIG_I2C_MPC=y
1027# 1032#
1028# CONFIG_I2C_PCA_PLATFORM is not set 1033# CONFIG_I2C_PCA_PLATFORM is not set
1029# CONFIG_I2C_STUB is not set 1034# CONFIG_I2C_STUB is not set
1030
1031#
1032# Miscellaneous I2C Chip support
1033#
1034# CONFIG_SENSORS_TSL2550 is not set
1035# CONFIG_I2C_DEBUG_CORE is not set 1035# CONFIG_I2C_DEBUG_CORE is not set
1036# CONFIG_I2C_DEBUG_ALGO is not set 1036# CONFIG_I2C_DEBUG_ALGO is not set
1037# CONFIG_I2C_DEBUG_BUS is not set 1037# CONFIG_I2C_DEBUG_BUS is not set
1038# CONFIG_I2C_DEBUG_CHIP is not set
1039CONFIG_SPI=y 1038CONFIG_SPI=y
1040CONFIG_SPI_MASTER=y 1039CONFIG_SPI_MASTER=y
1041 1040
@@ -1094,21 +1093,24 @@ CONFIG_SSB_POSSIBLE=y
1094# Multifunction device drivers 1093# Multifunction device drivers
1095# 1094#
1096# CONFIG_MFD_CORE is not set 1095# CONFIG_MFD_CORE is not set
1096# CONFIG_MFD_88PM860X is not set
1097# CONFIG_MFD_SM501 is not set 1097# CONFIG_MFD_SM501 is not set
1098# CONFIG_HTC_PASIC3 is not set 1098# CONFIG_HTC_PASIC3 is not set
1099# CONFIG_TWL4030_CORE is not set 1099# CONFIG_TWL4030_CORE is not set
1100# CONFIG_MFD_TMIO is not set 1100# CONFIG_MFD_TMIO is not set
1101# CONFIG_PMIC_DA903X is not set 1101# CONFIG_PMIC_DA903X is not set
1102# CONFIG_PMIC_ADP5520 is not set 1102# CONFIG_PMIC_ADP5520 is not set
1103# CONFIG_MFD_MAX8925 is not set
1103# CONFIG_MFD_WM8400 is not set 1104# CONFIG_MFD_WM8400 is not set
1104# CONFIG_MFD_WM831X is not set 1105# CONFIG_MFD_WM831X is not set
1105# CONFIG_MFD_WM8350_I2C is not set 1106# CONFIG_MFD_WM8350_I2C is not set
1107# CONFIG_MFD_WM8994 is not set
1106# CONFIG_MFD_PCF50633 is not set 1108# CONFIG_MFD_PCF50633 is not set
1107# CONFIG_MFD_MC13783 is not set 1109# CONFIG_MFD_MC13783 is not set
1108# CONFIG_AB3100_CORE is not set 1110# CONFIG_AB3100_CORE is not set
1109# CONFIG_EZX_PCAP is not set 1111# CONFIG_EZX_PCAP is not set
1110# CONFIG_MFD_88PM8607 is not set
1111# CONFIG_AB4500_CORE is not set 1112# CONFIG_AB4500_CORE is not set
1113# CONFIG_LPC_SCH is not set
1112# CONFIG_REGULATOR is not set 1114# CONFIG_REGULATOR is not set
1113# CONFIG_MEDIA_SUPPORT is not set 1115# CONFIG_MEDIA_SUPPORT is not set
1114 1116
@@ -1117,6 +1119,7 @@ CONFIG_SSB_POSSIBLE=y
1117# 1119#
1118# CONFIG_AGP is not set 1120# CONFIG_AGP is not set
1119CONFIG_VGA_ARB=y 1121CONFIG_VGA_ARB=y
1122CONFIG_VGA_ARB_MAX_GPUS=16
1120# CONFIG_DRM is not set 1123# CONFIG_DRM is not set
1121# CONFIG_VGASTATE is not set 1124# CONFIG_VGASTATE is not set
1122CONFIG_VIDEO_OUTPUT_CONTROL=m 1125CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1221,7 +1224,6 @@ CONFIG_USB_STORAGE=y
1221# CONFIG_USB_RIO500 is not set 1224# CONFIG_USB_RIO500 is not set
1222# CONFIG_USB_LEGOTOWER is not set 1225# CONFIG_USB_LEGOTOWER is not set
1223# CONFIG_USB_LCD is not set 1226# CONFIG_USB_LCD is not set
1224# CONFIG_USB_BERRY_CHARGE is not set
1225# CONFIG_USB_LED is not set 1227# CONFIG_USB_LED is not set
1226# CONFIG_USB_CYPRESS_CY7C63 is not set 1228# CONFIG_USB_CYPRESS_CY7C63 is not set
1227# CONFIG_USB_CYTHERM is not set 1229# CONFIG_USB_CYTHERM is not set
@@ -1234,7 +1236,6 @@ CONFIG_USB_STORAGE=y
1234# CONFIG_USB_IOWARRIOR is not set 1236# CONFIG_USB_IOWARRIOR is not set
1235# CONFIG_USB_TEST is not set 1237# CONFIG_USB_TEST is not set
1236# CONFIG_USB_ISIGHTFW is not set 1238# CONFIG_USB_ISIGHTFW is not set
1237# CONFIG_USB_VST is not set
1238# CONFIG_USB_GADGET is not set 1239# CONFIG_USB_GADGET is not set
1239 1240
1240# 1241#
@@ -1398,6 +1399,7 @@ CONFIG_MISC_FILESYSTEMS=y
1398# CONFIG_BFS_FS is not set 1399# CONFIG_BFS_FS is not set
1399# CONFIG_EFS_FS is not set 1400# CONFIG_EFS_FS is not set
1400# CONFIG_JFFS2_FS is not set 1401# CONFIG_JFFS2_FS is not set
1402# CONFIG_LOGFS is not set
1401# CONFIG_CRAMFS is not set 1403# CONFIG_CRAMFS is not set
1402# CONFIG_SQUASHFS is not set 1404# CONFIG_SQUASHFS is not set
1403# CONFIG_VXFS_FS is not set 1405# CONFIG_VXFS_FS is not set
@@ -1424,6 +1426,7 @@ CONFIG_SUNRPC_GSS=y
1424CONFIG_RPCSEC_GSS_KRB5=y 1426CONFIG_RPCSEC_GSS_KRB5=y
1425# CONFIG_RPCSEC_GSS_SPKM3 is not set 1427# CONFIG_RPCSEC_GSS_SPKM3 is not set
1426# CONFIG_SMB_FS is not set 1428# CONFIG_SMB_FS is not set
1429# CONFIG_CEPH_FS is not set
1427# CONFIG_CIFS is not set 1430# CONFIG_CIFS is not set
1428# CONFIG_NCP_FS is not set 1431# CONFIG_NCP_FS is not set
1429# CONFIG_CODA_FS is not set 1432# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index a494e8adf80b..41401a9b355e 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:20 2010 4# Mon Apr 19 23:16:44 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100# CONFIG_FAIR_GROUP_SCHED is not set
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -323,6 +319,7 @@ CONFIG_ISA_DMA_API=y
323# Bus options 319# Bus options
324# 320#
325CONFIG_ZONE_DMA=y 321CONFIG_ZONE_DMA=y
322# CONFIG_NEED_DMA_MAP_STATE is not set
326CONFIG_GENERIC_ISA_DMA=y 323CONFIG_GENERIC_ISA_DMA=y
327CONFIG_PPC_INDIRECT_PCI=y 324CONFIG_PPC_INDIRECT_PCI=y
328CONFIG_FSL_SOC=y 325CONFIG_FSL_SOC=y
@@ -334,7 +331,6 @@ CONFIG_PCI_SYSCALL=y
334# CONFIG_PCIEPORTBUS is not set 331# CONFIG_PCIEPORTBUS is not set
335CONFIG_ARCH_SUPPORTS_MSI=y 332CONFIG_ARCH_SUPPORTS_MSI=y
336# CONFIG_PCI_MSI is not set 333# CONFIG_PCI_MSI is not set
337# CONFIG_PCI_LEGACY is not set
338# CONFIG_PCI_STUB is not set 334# CONFIG_PCI_STUB is not set
339# CONFIG_PCI_IOV is not set 335# CONFIG_PCI_IOV is not set
340# CONFIG_PCCARD is not set 336# CONFIG_PCCARD is not set
@@ -360,7 +356,6 @@ CONFIG_NET=y
360# Networking options 356# Networking options
361# 357#
362CONFIG_PACKET=y 358CONFIG_PACKET=y
363# CONFIG_PACKET_MMAP is not set
364CONFIG_UNIX=y 359CONFIG_UNIX=y
365CONFIG_XFRM=y 360CONFIG_XFRM=y
366# CONFIG_XFRM_USER is not set 361# CONFIG_XFRM_USER is not set
@@ -539,6 +534,8 @@ CONFIG_MTD_PHYSMAP=y
539# UBI - Unsorted block images 534# UBI - Unsorted block images
540# 535#
541# CONFIG_MTD_UBI is not set 536# CONFIG_MTD_UBI is not set
537CONFIG_OF_FLATTREE=y
538CONFIG_OF_DYNAMIC=y
542CONFIG_OF_DEVICE=y 539CONFIG_OF_DEVICE=y
543CONFIG_OF_I2C=y 540CONFIG_OF_I2C=y
544CONFIG_OF_SPI=y 541CONFIG_OF_SPI=y
@@ -576,6 +573,7 @@ CONFIG_MISC_DEVICES=y
576# CONFIG_ENCLOSURE_SERVICES is not set 573# CONFIG_ENCLOSURE_SERVICES is not set
577# CONFIG_HP_ILO is not set 574# CONFIG_HP_ILO is not set
578# CONFIG_ISL29003 is not set 575# CONFIG_ISL29003 is not set
576# CONFIG_SENSORS_TSL2550 is not set
579# CONFIG_DS1682 is not set 577# CONFIG_DS1682 is not set
580# CONFIG_TI_DAC7512 is not set 578# CONFIG_TI_DAC7512 is not set
581# CONFIG_C2PORT is not set 579# CONFIG_C2PORT is not set
@@ -595,6 +593,7 @@ CONFIG_HAVE_IDE=y
595# 593#
596# SCSI device support 594# SCSI device support
597# 595#
596CONFIG_SCSI_MOD=y
598# CONFIG_RAID_ATTRS is not set 597# CONFIG_RAID_ATTRS is not set
599CONFIG_SCSI=y 598CONFIG_SCSI=y
600CONFIG_SCSI_DMA=y 599CONFIG_SCSI_DMA=y
@@ -755,6 +754,8 @@ CONFIG_NETDEV_10000=y
755# CONFIG_CHELSIO_T1 is not set 754# CONFIG_CHELSIO_T1 is not set
756CONFIG_CHELSIO_T3_DEPENDS=y 755CONFIG_CHELSIO_T3_DEPENDS=y
757# CONFIG_CHELSIO_T3 is not set 756# CONFIG_CHELSIO_T3 is not set
757CONFIG_CHELSIO_T4_DEPENDS=y
758# CONFIG_CHELSIO_T4 is not set
758# CONFIG_ENIC is not set 759# CONFIG_ENIC is not set
759# CONFIG_IXGBE is not set 760# CONFIG_IXGBE is not set
760# CONFIG_IXGB is not set 761# CONFIG_IXGB is not set
@@ -767,6 +768,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
767# CONFIG_MLX4_CORE is not set 768# CONFIG_MLX4_CORE is not set
768# CONFIG_TEHUTI is not set 769# CONFIG_TEHUTI is not set
769# CONFIG_BNX2X is not set 770# CONFIG_BNX2X is not set
771# CONFIG_QLCNIC is not set
770# CONFIG_QLGE is not set 772# CONFIG_QLGE is not set
771# CONFIG_SFC is not set 773# CONFIG_SFC is not set
772# CONFIG_BE2NET is not set 774# CONFIG_BE2NET is not set
@@ -841,6 +843,7 @@ CONFIG_SERIAL_CORE=y
841CONFIG_SERIAL_CORE_CONSOLE=y 843CONFIG_SERIAL_CORE_CONSOLE=y
842# CONFIG_SERIAL_JSM is not set 844# CONFIG_SERIAL_JSM is not set
843# CONFIG_SERIAL_OF_PLATFORM is not set 845# CONFIG_SERIAL_OF_PLATFORM is not set
846# CONFIG_SERIAL_TIMBERDALE is not set
844# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 847# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
845CONFIG_UNIX98_PTYS=y 848CONFIG_UNIX98_PTYS=y
846# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 849# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -890,6 +893,7 @@ CONFIG_I2C_HELPER_AUTO=y
890CONFIG_I2C_MPC=y 893CONFIG_I2C_MPC=y
891# CONFIG_I2C_OCORES is not set 894# CONFIG_I2C_OCORES is not set
892# CONFIG_I2C_SIMTEC is not set 895# CONFIG_I2C_SIMTEC is not set
896# CONFIG_I2C_XILINX is not set
893 897
894# 898#
895# External I2C/SMBus adapter drivers 899# External I2C/SMBus adapter drivers
@@ -903,15 +907,9 @@ CONFIG_I2C_MPC=y
903# 907#
904# CONFIG_I2C_PCA_PLATFORM is not set 908# CONFIG_I2C_PCA_PLATFORM is not set
905# CONFIG_I2C_STUB is not set 909# CONFIG_I2C_STUB is not set
906
907#
908# Miscellaneous I2C Chip support
909#
910# CONFIG_SENSORS_TSL2550 is not set
911# CONFIG_I2C_DEBUG_CORE is not set 910# CONFIG_I2C_DEBUG_CORE is not set
912# CONFIG_I2C_DEBUG_ALGO is not set 911# CONFIG_I2C_DEBUG_ALGO is not set
913# CONFIG_I2C_DEBUG_BUS is not set 912# CONFIG_I2C_DEBUG_BUS is not set
914# CONFIG_I2C_DEBUG_CHIP is not set
915CONFIG_SPI=y 913CONFIG_SPI=y
916CONFIG_SPI_MASTER=y 914CONFIG_SPI_MASTER=y
917 915
@@ -970,21 +968,24 @@ CONFIG_SSB_POSSIBLE=y
970# Multifunction device drivers 968# Multifunction device drivers
971# 969#
972# CONFIG_MFD_CORE is not set 970# CONFIG_MFD_CORE is not set
971# CONFIG_MFD_88PM860X is not set
973# CONFIG_MFD_SM501 is not set 972# CONFIG_MFD_SM501 is not set
974# CONFIG_HTC_PASIC3 is not set 973# CONFIG_HTC_PASIC3 is not set
975# CONFIG_TWL4030_CORE is not set 974# CONFIG_TWL4030_CORE is not set
976# CONFIG_MFD_TMIO is not set 975# CONFIG_MFD_TMIO is not set
977# CONFIG_PMIC_DA903X is not set 976# CONFIG_PMIC_DA903X is not set
978# CONFIG_PMIC_ADP5520 is not set 977# CONFIG_PMIC_ADP5520 is not set
978# CONFIG_MFD_MAX8925 is not set
979# CONFIG_MFD_WM8400 is not set 979# CONFIG_MFD_WM8400 is not set
980# CONFIG_MFD_WM831X is not set 980# CONFIG_MFD_WM831X is not set
981# CONFIG_MFD_WM8350_I2C is not set 981# CONFIG_MFD_WM8350_I2C is not set
982# CONFIG_MFD_WM8994 is not set
982# CONFIG_MFD_PCF50633 is not set 983# CONFIG_MFD_PCF50633 is not set
983# CONFIG_MFD_MC13783 is not set 984# CONFIG_MFD_MC13783 is not set
984# CONFIG_AB3100_CORE is not set 985# CONFIG_AB3100_CORE is not set
985# CONFIG_EZX_PCAP is not set 986# CONFIG_EZX_PCAP is not set
986# CONFIG_MFD_88PM8607 is not set
987# CONFIG_AB4500_CORE is not set 987# CONFIG_AB4500_CORE is not set
988# CONFIG_LPC_SCH is not set
988# CONFIG_REGULATOR is not set 989# CONFIG_REGULATOR is not set
989# CONFIG_MEDIA_SUPPORT is not set 990# CONFIG_MEDIA_SUPPORT is not set
990 991
@@ -993,6 +994,7 @@ CONFIG_SSB_POSSIBLE=y
993# 994#
994# CONFIG_AGP is not set 995# CONFIG_AGP is not set
995CONFIG_VGA_ARB=y 996CONFIG_VGA_ARB=y
997CONFIG_VGA_ARB_MAX_GPUS=16
996# CONFIG_DRM is not set 998# CONFIG_DRM is not set
997# CONFIG_VGASTATE is not set 999# CONFIG_VGASTATE is not set
998CONFIG_VIDEO_OUTPUT_CONTROL=m 1000CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1097,7 +1099,6 @@ CONFIG_USB_STORAGE=y
1097# CONFIG_USB_RIO500 is not set 1099# CONFIG_USB_RIO500 is not set
1098# CONFIG_USB_LEGOTOWER is not set 1100# CONFIG_USB_LEGOTOWER is not set
1099# CONFIG_USB_LCD is not set 1101# CONFIG_USB_LCD is not set
1100# CONFIG_USB_BERRY_CHARGE is not set
1101# CONFIG_USB_LED is not set 1102# CONFIG_USB_LED is not set
1102# CONFIG_USB_CYPRESS_CY7C63 is not set 1103# CONFIG_USB_CYPRESS_CY7C63 is not set
1103# CONFIG_USB_CYTHERM is not set 1104# CONFIG_USB_CYTHERM is not set
@@ -1110,7 +1111,6 @@ CONFIG_USB_STORAGE=y
1110# CONFIG_USB_IOWARRIOR is not set 1111# CONFIG_USB_IOWARRIOR is not set
1111# CONFIG_USB_TEST is not set 1112# CONFIG_USB_TEST is not set
1112# CONFIG_USB_ISIGHTFW is not set 1113# CONFIG_USB_ISIGHTFW is not set
1113# CONFIG_USB_VST is not set
1114# CONFIG_USB_GADGET is not set 1114# CONFIG_USB_GADGET is not set
1115 1115
1116# 1116#
@@ -1274,6 +1274,7 @@ CONFIG_MISC_FILESYSTEMS=y
1274# CONFIG_BFS_FS is not set 1274# CONFIG_BFS_FS is not set
1275# CONFIG_EFS_FS is not set 1275# CONFIG_EFS_FS is not set
1276# CONFIG_JFFS2_FS is not set 1276# CONFIG_JFFS2_FS is not set
1277# CONFIG_LOGFS is not set
1277# CONFIG_CRAMFS is not set 1278# CONFIG_CRAMFS is not set
1278# CONFIG_SQUASHFS is not set 1279# CONFIG_SQUASHFS is not set
1279# CONFIG_VXFS_FS is not set 1280# CONFIG_VXFS_FS is not set
@@ -1300,6 +1301,7 @@ CONFIG_SUNRPC_GSS=y
1300CONFIG_RPCSEC_GSS_KRB5=y 1301CONFIG_RPCSEC_GSS_KRB5=y
1301# CONFIG_RPCSEC_GSS_SPKM3 is not set 1302# CONFIG_RPCSEC_GSS_SPKM3 is not set
1302# CONFIG_SMB_FS is not set 1303# CONFIG_SMB_FS is not set
1304# CONFIG_CEPH_FS is not set
1303# CONFIG_CIFS is not set 1305# CONFIG_CIFS is not set
1304# CONFIG_NCP_FS is not set 1306# CONFIG_NCP_FS is not set
1305# CONFIG_CODA_FS is not set 1307# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index caea0e6e1a76..dc176b676dce 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:21 2010 4# Mon Apr 19 23:16:45 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100# CONFIG_FAIR_GROUP_SCHED is not set
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -323,6 +319,7 @@ CONFIG_ISA_DMA_API=y
323# Bus options 319# Bus options
324# 320#
325CONFIG_ZONE_DMA=y 321CONFIG_ZONE_DMA=y
322# CONFIG_NEED_DMA_MAP_STATE is not set
326CONFIG_GENERIC_ISA_DMA=y 323CONFIG_GENERIC_ISA_DMA=y
327CONFIG_PPC_INDIRECT_PCI=y 324CONFIG_PPC_INDIRECT_PCI=y
328CONFIG_FSL_SOC=y 325CONFIG_FSL_SOC=y
@@ -334,7 +331,6 @@ CONFIG_PCI_SYSCALL=y
334# CONFIG_PCIEPORTBUS is not set 331# CONFIG_PCIEPORTBUS is not set
335CONFIG_ARCH_SUPPORTS_MSI=y 332CONFIG_ARCH_SUPPORTS_MSI=y
336# CONFIG_PCI_MSI is not set 333# CONFIG_PCI_MSI is not set
337# CONFIG_PCI_LEGACY is not set
338# CONFIG_PCI_STUB is not set 334# CONFIG_PCI_STUB is not set
339# CONFIG_PCI_IOV is not set 335# CONFIG_PCI_IOV is not set
340# CONFIG_PCCARD is not set 336# CONFIG_PCCARD is not set
@@ -360,7 +356,6 @@ CONFIG_NET=y
360# Networking options 356# Networking options
361# 357#
362CONFIG_PACKET=y 358CONFIG_PACKET=y
363# CONFIG_PACKET_MMAP is not set
364CONFIG_UNIX=y 359CONFIG_UNIX=y
365CONFIG_XFRM=y 360CONFIG_XFRM=y
366CONFIG_XFRM_USER=m 361CONFIG_XFRM_USER=m
@@ -455,6 +450,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
455# CONFIG_SYS_HYPERVISOR is not set 450# CONFIG_SYS_HYPERVISOR is not set
456# CONFIG_CONNECTOR is not set 451# CONFIG_CONNECTOR is not set
457# CONFIG_MTD is not set 452# CONFIG_MTD is not set
453CONFIG_OF_FLATTREE=y
454CONFIG_OF_DYNAMIC=y
458CONFIG_OF_DEVICE=y 455CONFIG_OF_DEVICE=y
459CONFIG_OF_I2C=y 456CONFIG_OF_I2C=y
460CONFIG_OF_MDIO=y 457CONFIG_OF_MDIO=y
@@ -490,6 +487,7 @@ CONFIG_MISC_DEVICES=y
490# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
491# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
492# CONFIG_ISL29003 is not set 489# CONFIG_ISL29003 is not set
490# CONFIG_SENSORS_TSL2550 is not set
493# CONFIG_DS1682 is not set 491# CONFIG_DS1682 is not set
494# CONFIG_C2PORT is not set 492# CONFIG_C2PORT is not set
495 493
@@ -507,6 +505,7 @@ CONFIG_HAVE_IDE=y
507# 505#
508# SCSI device support 506# SCSI device support
509# 507#
508CONFIG_SCSI_MOD=y
510# CONFIG_RAID_ATTRS is not set 509# CONFIG_RAID_ATTRS is not set
511# CONFIG_SCSI is not set 510# CONFIG_SCSI is not set
512# CONFIG_SCSI_DMA is not set 511# CONFIG_SCSI_DMA is not set
@@ -579,6 +578,7 @@ CONFIG_NET_PCI=y
579# CONFIG_PCNET32 is not set 578# CONFIG_PCNET32 is not set
580# CONFIG_AMD8111_ETH is not set 579# CONFIG_AMD8111_ETH is not set
581# CONFIG_ADAPTEC_STARFIRE is not set 580# CONFIG_ADAPTEC_STARFIRE is not set
581# CONFIG_KSZ884X_PCI is not set
582# CONFIG_B44 is not set 582# CONFIG_B44 is not set
583# CONFIG_FORCEDETH is not set 583# CONFIG_FORCEDETH is not set
584CONFIG_E100=y 584CONFIG_E100=y
@@ -630,6 +630,8 @@ CONFIG_NETDEV_10000=y
630# CONFIG_CHELSIO_T1 is not set 630# CONFIG_CHELSIO_T1 is not set
631CONFIG_CHELSIO_T3_DEPENDS=y 631CONFIG_CHELSIO_T3_DEPENDS=y
632# CONFIG_CHELSIO_T3 is not set 632# CONFIG_CHELSIO_T3 is not set
633CONFIG_CHELSIO_T4_DEPENDS=y
634# CONFIG_CHELSIO_T4 is not set
633# CONFIG_ENIC is not set 635# CONFIG_ENIC is not set
634# CONFIG_IXGBE is not set 636# CONFIG_IXGBE is not set
635# CONFIG_IXGB is not set 637# CONFIG_IXGB is not set
@@ -642,6 +644,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
642# CONFIG_MLX4_CORE is not set 644# CONFIG_MLX4_CORE is not set
643# CONFIG_TEHUTI is not set 645# CONFIG_TEHUTI is not set
644# CONFIG_BNX2X is not set 646# CONFIG_BNX2X is not set
647# CONFIG_QLCNIC is not set
645# CONFIG_QLGE is not set 648# CONFIG_QLGE is not set
646# CONFIG_SFC is not set 649# CONFIG_SFC is not set
647# CONFIG_BE2NET is not set 650# CONFIG_BE2NET is not set
@@ -725,6 +728,7 @@ CONFIG_SERIAL_CORE=y
725CONFIG_SERIAL_CORE_CONSOLE=y 728CONFIG_SERIAL_CORE_CONSOLE=y
726# CONFIG_SERIAL_JSM is not set 729# CONFIG_SERIAL_JSM is not set
727# CONFIG_SERIAL_OF_PLATFORM is not set 730# CONFIG_SERIAL_OF_PLATFORM is not set
731# CONFIG_SERIAL_TIMBERDALE is not set
728# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 732# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
729CONFIG_UNIX98_PTYS=y 733CONFIG_UNIX98_PTYS=y
730# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 734# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -773,6 +777,7 @@ CONFIG_I2C_HELPER_AUTO=y
773CONFIG_I2C_MPC=y 777CONFIG_I2C_MPC=y
774# CONFIG_I2C_OCORES is not set 778# CONFIG_I2C_OCORES is not set
775# CONFIG_I2C_SIMTEC is not set 779# CONFIG_I2C_SIMTEC is not set
780# CONFIG_I2C_XILINX is not set
776 781
777# 782#
778# External I2C/SMBus adapter drivers 783# External I2C/SMBus adapter drivers
@@ -785,15 +790,9 @@ CONFIG_I2C_MPC=y
785# 790#
786# CONFIG_I2C_PCA_PLATFORM is not set 791# CONFIG_I2C_PCA_PLATFORM is not set
787# CONFIG_I2C_STUB is not set 792# CONFIG_I2C_STUB is not set
788
789#
790# Miscellaneous I2C Chip support
791#
792# CONFIG_SENSORS_TSL2550 is not set
793# CONFIG_I2C_DEBUG_CORE is not set 793# CONFIG_I2C_DEBUG_CORE is not set
794# CONFIG_I2C_DEBUG_ALGO is not set 794# CONFIG_I2C_DEBUG_ALGO is not set
795# CONFIG_I2C_DEBUG_BUS is not set 795# CONFIG_I2C_DEBUG_BUS is not set
796# CONFIG_I2C_DEBUG_CHIP is not set
797# CONFIG_SPI is not set 796# CONFIG_SPI is not set
798 797
799# 798#
@@ -819,10 +818,11 @@ CONFIG_HWMON=y
819# CONFIG_SENSORS_ADM1029 is not set 818# CONFIG_SENSORS_ADM1029 is not set
820# CONFIG_SENSORS_ADM1031 is not set 819# CONFIG_SENSORS_ADM1031 is not set
821# CONFIG_SENSORS_ADM9240 is not set 820# CONFIG_SENSORS_ADM9240 is not set
821# CONFIG_SENSORS_ADT7411 is not set
822# CONFIG_SENSORS_ADT7462 is not set 822# CONFIG_SENSORS_ADT7462 is not set
823# CONFIG_SENSORS_ADT7470 is not set 823# CONFIG_SENSORS_ADT7470 is not set
824# CONFIG_SENSORS_ADT7473 is not set
825# CONFIG_SENSORS_ADT7475 is not set 824# CONFIG_SENSORS_ADT7475 is not set
825# CONFIG_SENSORS_ASC7621 is not set
826# CONFIG_SENSORS_ATXP1 is not set 826# CONFIG_SENSORS_ATXP1 is not set
827# CONFIG_SENSORS_DS1621 is not set 827# CONFIG_SENSORS_DS1621 is not set
828# CONFIG_SENSORS_I5K_AMB is not set 828# CONFIG_SENSORS_I5K_AMB is not set
@@ -859,6 +859,7 @@ CONFIG_HWMON=y
859# CONFIG_SENSORS_SMSC47M192 is not set 859# CONFIG_SENSORS_SMSC47M192 is not set
860# CONFIG_SENSORS_SMSC47B397 is not set 860# CONFIG_SENSORS_SMSC47B397 is not set
861# CONFIG_SENSORS_ADS7828 is not set 861# CONFIG_SENSORS_ADS7828 is not set
862# CONFIG_SENSORS_AMC6821 is not set
862# CONFIG_SENSORS_THMC50 is not set 863# CONFIG_SENSORS_THMC50 is not set
863# CONFIG_SENSORS_TMP401 is not set 864# CONFIG_SENSORS_TMP401 is not set
864# CONFIG_SENSORS_TMP421 is not set 865# CONFIG_SENSORS_TMP421 is not set
@@ -901,18 +902,21 @@ CONFIG_SSB_POSSIBLE=y
901# Multifunction device drivers 902# Multifunction device drivers
902# 903#
903# CONFIG_MFD_CORE is not set 904# CONFIG_MFD_CORE is not set
905# CONFIG_MFD_88PM860X is not set
904# CONFIG_MFD_SM501 is not set 906# CONFIG_MFD_SM501 is not set
905# CONFIG_HTC_PASIC3 is not set 907# CONFIG_HTC_PASIC3 is not set
906# CONFIG_TWL4030_CORE is not set 908# CONFIG_TWL4030_CORE is not set
907# CONFIG_MFD_TMIO is not set 909# CONFIG_MFD_TMIO is not set
908# CONFIG_PMIC_DA903X is not set 910# CONFIG_PMIC_DA903X is not set
909# CONFIG_PMIC_ADP5520 is not set 911# CONFIG_PMIC_ADP5520 is not set
912# CONFIG_MFD_MAX8925 is not set
910# CONFIG_MFD_WM8400 is not set 913# CONFIG_MFD_WM8400 is not set
911# CONFIG_MFD_WM831X is not set 914# CONFIG_MFD_WM831X is not set
912# CONFIG_MFD_WM8350_I2C is not set 915# CONFIG_MFD_WM8350_I2C is not set
916# CONFIG_MFD_WM8994 is not set
913# CONFIG_MFD_PCF50633 is not set 917# CONFIG_MFD_PCF50633 is not set
914# CONFIG_AB3100_CORE is not set 918# CONFIG_AB3100_CORE is not set
915# CONFIG_MFD_88PM8607 is not set 919# CONFIG_LPC_SCH is not set
916# CONFIG_REGULATOR is not set 920# CONFIG_REGULATOR is not set
917# CONFIG_MEDIA_SUPPORT is not set 921# CONFIG_MEDIA_SUPPORT is not set
918 922
@@ -921,6 +925,7 @@ CONFIG_SSB_POSSIBLE=y
921# 925#
922# CONFIG_AGP is not set 926# CONFIG_AGP is not set
923CONFIG_VGA_ARB=y 927CONFIG_VGA_ARB=y
928CONFIG_VGA_ARB_MAX_GPUS=16
924# CONFIG_DRM is not set 929# CONFIG_DRM is not set
925# CONFIG_VGASTATE is not set 930# CONFIG_VGASTATE is not set
926CONFIG_VIDEO_OUTPUT_CONTROL=m 931CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1105,6 +1110,7 @@ CONFIG_MISC_FILESYSTEMS=y
1105# CONFIG_BEFS_FS is not set 1110# CONFIG_BEFS_FS is not set
1106# CONFIG_BFS_FS is not set 1111# CONFIG_BFS_FS is not set
1107# CONFIG_EFS_FS is not set 1112# CONFIG_EFS_FS is not set
1113# CONFIG_LOGFS is not set
1108# CONFIG_CRAMFS is not set 1114# CONFIG_CRAMFS is not set
1109# CONFIG_SQUASHFS is not set 1115# CONFIG_SQUASHFS is not set
1110# CONFIG_VXFS_FS is not set 1116# CONFIG_VXFS_FS is not set
@@ -1131,6 +1137,7 @@ CONFIG_SUNRPC_GSS=y
1131CONFIG_RPCSEC_GSS_KRB5=y 1137CONFIG_RPCSEC_GSS_KRB5=y
1132# CONFIG_RPCSEC_GSS_SPKM3 is not set 1138# CONFIG_RPCSEC_GSS_SPKM3 is not set
1133# CONFIG_SMB_FS is not set 1139# CONFIG_SMB_FS is not set
1140# CONFIG_CEPH_FS is not set
1134# CONFIG_CIFS is not set 1141# CONFIG_CIFS is not set
1135# CONFIG_NCP_FS is not set 1142# CONFIG_NCP_FS is not set
1136# CONFIG_CODA_FS is not set 1143# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index dc14639fadda..f512972c7176 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:21 2010 4# Mon Apr 19 23:16:46 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100# CONFIG_FAIR_GROUP_SCHED is not set
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -322,6 +318,7 @@ CONFIG_ISA_DMA_API=y
322# Bus options 318# Bus options
323# 319#
324CONFIG_ZONE_DMA=y 320CONFIG_ZONE_DMA=y
321# CONFIG_NEED_DMA_MAP_STATE is not set
325CONFIG_GENERIC_ISA_DMA=y 322CONFIG_GENERIC_ISA_DMA=y
326CONFIG_PPC_INDIRECT_PCI=y 323CONFIG_PPC_INDIRECT_PCI=y
327CONFIG_FSL_SOC=y 324CONFIG_FSL_SOC=y
@@ -333,7 +330,6 @@ CONFIG_PCI_SYSCALL=y
333# CONFIG_PCIEPORTBUS is not set 330# CONFIG_PCIEPORTBUS is not set
334CONFIG_ARCH_SUPPORTS_MSI=y 331CONFIG_ARCH_SUPPORTS_MSI=y
335# CONFIG_PCI_MSI is not set 332# CONFIG_PCI_MSI is not set
336# CONFIG_PCI_LEGACY is not set
337# CONFIG_PCI_STUB is not set 333# CONFIG_PCI_STUB is not set
338# CONFIG_PCI_IOV is not set 334# CONFIG_PCI_IOV is not set
339# CONFIG_PCCARD is not set 335# CONFIG_PCCARD is not set
@@ -359,7 +355,6 @@ CONFIG_NET=y
359# Networking options 355# Networking options
360# 356#
361CONFIG_PACKET=y 357CONFIG_PACKET=y
362# CONFIG_PACKET_MMAP is not set
363CONFIG_UNIX=y 358CONFIG_UNIX=y
364CONFIG_XFRM=y 359CONFIG_XFRM=y
365# CONFIG_XFRM_USER is not set 360# CONFIG_XFRM_USER is not set
@@ -537,6 +532,8 @@ CONFIG_MTD_PHYSMAP_OF=y
537# UBI - Unsorted block images 532# UBI - Unsorted block images
538# 533#
539# CONFIG_MTD_UBI is not set 534# CONFIG_MTD_UBI is not set
535CONFIG_OF_FLATTREE=y
536CONFIG_OF_DYNAMIC=y
540CONFIG_OF_DEVICE=y 537CONFIG_OF_DEVICE=y
541CONFIG_OF_I2C=y 538CONFIG_OF_I2C=y
542CONFIG_OF_MDIO=y 539CONFIG_OF_MDIO=y
@@ -572,6 +569,7 @@ CONFIG_MISC_DEVICES=y
572# CONFIG_ENCLOSURE_SERVICES is not set 569# CONFIG_ENCLOSURE_SERVICES is not set
573# CONFIG_HP_ILO is not set 570# CONFIG_HP_ILO is not set
574# CONFIG_ISL29003 is not set 571# CONFIG_ISL29003 is not set
572# CONFIG_SENSORS_TSL2550 is not set
575# CONFIG_DS1682 is not set 573# CONFIG_DS1682 is not set
576# CONFIG_C2PORT is not set 574# CONFIG_C2PORT is not set
577 575
@@ -589,6 +587,7 @@ CONFIG_HAVE_IDE=y
589# 587#
590# SCSI device support 588# SCSI device support
591# 589#
590CONFIG_SCSI_MOD=y
592# CONFIG_RAID_ATTRS is not set 591# CONFIG_RAID_ATTRS is not set
593CONFIG_SCSI=y 592CONFIG_SCSI=y
594CONFIG_SCSI_DMA=y 593CONFIG_SCSI_DMA=y
@@ -773,6 +772,8 @@ CONFIG_NETDEV_10000=y
773# CONFIG_CHELSIO_T1 is not set 772# CONFIG_CHELSIO_T1 is not set
774CONFIG_CHELSIO_T3_DEPENDS=y 773CONFIG_CHELSIO_T3_DEPENDS=y
775# CONFIG_CHELSIO_T3 is not set 774# CONFIG_CHELSIO_T3 is not set
775CONFIG_CHELSIO_T4_DEPENDS=y
776# CONFIG_CHELSIO_T4 is not set
776# CONFIG_ENIC is not set 777# CONFIG_ENIC is not set
777# CONFIG_IXGBE is not set 778# CONFIG_IXGBE is not set
778# CONFIG_IXGB is not set 779# CONFIG_IXGB is not set
@@ -785,6 +786,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
785# CONFIG_MLX4_CORE is not set 786# CONFIG_MLX4_CORE is not set
786# CONFIG_TEHUTI is not set 787# CONFIG_TEHUTI is not set
787# CONFIG_BNX2X is not set 788# CONFIG_BNX2X is not set
789# CONFIG_QLCNIC is not set
788# CONFIG_QLGE is not set 790# CONFIG_QLGE is not set
789# CONFIG_SFC is not set 791# CONFIG_SFC is not set
790# CONFIG_BE2NET is not set 792# CONFIG_BE2NET is not set
@@ -870,6 +872,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
870# CONFIG_SERIAL_JSM is not set 872# CONFIG_SERIAL_JSM is not set
871# CONFIG_SERIAL_OF_PLATFORM is not set 873# CONFIG_SERIAL_OF_PLATFORM is not set
872# CONFIG_SERIAL_QE is not set 874# CONFIG_SERIAL_QE is not set
875# CONFIG_SERIAL_TIMBERDALE is not set
873# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 876# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
874CONFIG_UNIX98_PTYS=y 877CONFIG_UNIX98_PTYS=y
875# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 878# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -919,6 +922,7 @@ CONFIG_I2C_HELPER_AUTO=y
919CONFIG_I2C_MPC=y 922CONFIG_I2C_MPC=y
920# CONFIG_I2C_OCORES is not set 923# CONFIG_I2C_OCORES is not set
921# CONFIG_I2C_SIMTEC is not set 924# CONFIG_I2C_SIMTEC is not set
925# CONFIG_I2C_XILINX is not set
922 926
923# 927#
924# External I2C/SMBus adapter drivers 928# External I2C/SMBus adapter drivers
@@ -931,15 +935,9 @@ CONFIG_I2C_MPC=y
931# 935#
932# CONFIG_I2C_PCA_PLATFORM is not set 936# CONFIG_I2C_PCA_PLATFORM is not set
933# CONFIG_I2C_STUB is not set 937# CONFIG_I2C_STUB is not set
934
935#
936# Miscellaneous I2C Chip support
937#
938# CONFIG_SENSORS_TSL2550 is not set
939# CONFIG_I2C_DEBUG_CORE is not set 938# CONFIG_I2C_DEBUG_CORE is not set
940# CONFIG_I2C_DEBUG_ALGO is not set 939# CONFIG_I2C_DEBUG_ALGO is not set
941# CONFIG_I2C_DEBUG_BUS is not set 940# CONFIG_I2C_DEBUG_BUS is not set
942# CONFIG_I2C_DEBUG_CHIP is not set
943# CONFIG_SPI is not set 941# CONFIG_SPI is not set
944 942
945# 943#
@@ -965,10 +963,11 @@ CONFIG_HWMON=y
965# CONFIG_SENSORS_ADM1029 is not set 963# CONFIG_SENSORS_ADM1029 is not set
966# CONFIG_SENSORS_ADM1031 is not set 964# CONFIG_SENSORS_ADM1031 is not set
967# CONFIG_SENSORS_ADM9240 is not set 965# CONFIG_SENSORS_ADM9240 is not set
966# CONFIG_SENSORS_ADT7411 is not set
968# CONFIG_SENSORS_ADT7462 is not set 967# CONFIG_SENSORS_ADT7462 is not set
969# CONFIG_SENSORS_ADT7470 is not set 968# CONFIG_SENSORS_ADT7470 is not set
970# CONFIG_SENSORS_ADT7473 is not set
971# CONFIG_SENSORS_ADT7475 is not set 969# CONFIG_SENSORS_ADT7475 is not set
970# CONFIG_SENSORS_ASC7621 is not set
972# CONFIG_SENSORS_ATXP1 is not set 971# CONFIG_SENSORS_ATXP1 is not set
973# CONFIG_SENSORS_DS1621 is not set 972# CONFIG_SENSORS_DS1621 is not set
974# CONFIG_SENSORS_I5K_AMB is not set 973# CONFIG_SENSORS_I5K_AMB is not set
@@ -1005,6 +1004,7 @@ CONFIG_HWMON=y
1005# CONFIG_SENSORS_SMSC47M192 is not set 1004# CONFIG_SENSORS_SMSC47M192 is not set
1006# CONFIG_SENSORS_SMSC47B397 is not set 1005# CONFIG_SENSORS_SMSC47B397 is not set
1007# CONFIG_SENSORS_ADS7828 is not set 1006# CONFIG_SENSORS_ADS7828 is not set
1007# CONFIG_SENSORS_AMC6821 is not set
1008# CONFIG_SENSORS_THMC50 is not set 1008# CONFIG_SENSORS_THMC50 is not set
1009# CONFIG_SENSORS_TMP401 is not set 1009# CONFIG_SENSORS_TMP401 is not set
1010# CONFIG_SENSORS_TMP421 is not set 1010# CONFIG_SENSORS_TMP421 is not set
@@ -1047,18 +1047,21 @@ CONFIG_SSB_POSSIBLE=y
1047# Multifunction device drivers 1047# Multifunction device drivers
1048# 1048#
1049# CONFIG_MFD_CORE is not set 1049# CONFIG_MFD_CORE is not set
1050# CONFIG_MFD_88PM860X is not set
1050# CONFIG_MFD_SM501 is not set 1051# CONFIG_MFD_SM501 is not set
1051# CONFIG_HTC_PASIC3 is not set 1052# CONFIG_HTC_PASIC3 is not set
1052# CONFIG_TWL4030_CORE is not set 1053# CONFIG_TWL4030_CORE is not set
1053# CONFIG_MFD_TMIO is not set 1054# CONFIG_MFD_TMIO is not set
1054# CONFIG_PMIC_DA903X is not set 1055# CONFIG_PMIC_DA903X is not set
1055# CONFIG_PMIC_ADP5520 is not set 1056# CONFIG_PMIC_ADP5520 is not set
1057# CONFIG_MFD_MAX8925 is not set
1056# CONFIG_MFD_WM8400 is not set 1058# CONFIG_MFD_WM8400 is not set
1057# CONFIG_MFD_WM831X is not set 1059# CONFIG_MFD_WM831X is not set
1058# CONFIG_MFD_WM8350_I2C is not set 1060# CONFIG_MFD_WM8350_I2C is not set
1061# CONFIG_MFD_WM8994 is not set
1059# CONFIG_MFD_PCF50633 is not set 1062# CONFIG_MFD_PCF50633 is not set
1060# CONFIG_AB3100_CORE is not set 1063# CONFIG_AB3100_CORE is not set
1061# CONFIG_MFD_88PM8607 is not set 1064# CONFIG_LPC_SCH is not set
1062# CONFIG_REGULATOR is not set 1065# CONFIG_REGULATOR is not set
1063# CONFIG_MEDIA_SUPPORT is not set 1066# CONFIG_MEDIA_SUPPORT is not set
1064 1067
@@ -1067,6 +1070,7 @@ CONFIG_SSB_POSSIBLE=y
1067# 1070#
1068# CONFIG_AGP is not set 1071# CONFIG_AGP is not set
1069CONFIG_VGA_ARB=y 1072CONFIG_VGA_ARB=y
1073CONFIG_VGA_ARB_MAX_GPUS=16
1070# CONFIG_DRM is not set 1074# CONFIG_DRM is not set
1071# CONFIG_VGASTATE is not set 1075# CONFIG_VGASTATE is not set
1072CONFIG_VIDEO_OUTPUT_CONTROL=m 1076CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1252,6 +1256,7 @@ CONFIG_MISC_FILESYSTEMS=y
1252# CONFIG_BFS_FS is not set 1256# CONFIG_BFS_FS is not set
1253# CONFIG_EFS_FS is not set 1257# CONFIG_EFS_FS is not set
1254# CONFIG_JFFS2_FS is not set 1258# CONFIG_JFFS2_FS is not set
1259# CONFIG_LOGFS is not set
1255# CONFIG_CRAMFS is not set 1260# CONFIG_CRAMFS is not set
1256# CONFIG_SQUASHFS is not set 1261# CONFIG_SQUASHFS is not set
1257# CONFIG_VXFS_FS is not set 1262# CONFIG_VXFS_FS is not set
@@ -1278,6 +1283,7 @@ CONFIG_SUNRPC_GSS=y
1278CONFIG_RPCSEC_GSS_KRB5=y 1283CONFIG_RPCSEC_GSS_KRB5=y
1279# CONFIG_RPCSEC_GSS_SPKM3 is not set 1284# CONFIG_RPCSEC_GSS_SPKM3 is not set
1280# CONFIG_SMB_FS is not set 1285# CONFIG_SMB_FS is not set
1286# CONFIG_CEPH_FS is not set
1281# CONFIG_CIFS is not set 1287# CONFIG_CIFS is not set
1282# CONFIG_NCP_FS is not set 1288# CONFIG_NCP_FS is not set
1283# CONFIG_CODA_FS is not set 1289# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index 18533dc2674e..77abfe8ff198 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:23 2010 4# Mon Apr 19 23:16:47 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -97,11 +97,6 @@ CONFIG_RCU_FANOUT=32
97# CONFIG_TREE_RCU_TRACE is not set 97# CONFIG_TREE_RCU_TRACE is not set
98# CONFIG_IKCONFIG is not set 98# CONFIG_IKCONFIG is not set
99CONFIG_LOG_BUF_SHIFT=14 99CONFIG_LOG_BUF_SHIFT=14
100CONFIG_GROUP_SCHED=y
101CONFIG_FAIR_GROUP_SCHED=y
102# CONFIG_RT_GROUP_SCHED is not set
103CONFIG_USER_SCHED=y
104# CONFIG_CGROUP_SCHED is not set
105# CONFIG_CGROUPS is not set 100# CONFIG_CGROUPS is not set
106# CONFIG_SYSFS_DEPRECATED_V2 is not set 101# CONFIG_SYSFS_DEPRECATED_V2 is not set
107# CONFIG_RELAY is not set 102# CONFIG_RELAY is not set
@@ -111,6 +106,7 @@ CONFIG_INITRAMFS_SOURCE=""
111CONFIG_RD_GZIP=y 106CONFIG_RD_GZIP=y
112# CONFIG_RD_BZIP2 is not set 107# CONFIG_RD_BZIP2 is not set
113# CONFIG_RD_LZMA is not set 108# CONFIG_RD_LZMA is not set
109# CONFIG_RD_LZO is not set
114# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 110# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
115CONFIG_SYSCTL=y 111CONFIG_SYSCTL=y
116CONFIG_ANON_INODES=y 112CONFIG_ANON_INODES=y
@@ -322,6 +318,7 @@ CONFIG_ISA_DMA_API=y
322# Bus options 318# Bus options
323# 319#
324CONFIG_ZONE_DMA=y 320CONFIG_ZONE_DMA=y
321# CONFIG_NEED_DMA_MAP_STATE is not set
325CONFIG_GENERIC_ISA_DMA=y 322CONFIG_GENERIC_ISA_DMA=y
326CONFIG_PPC_INDIRECT_PCI=y 323CONFIG_PPC_INDIRECT_PCI=y
327CONFIG_FSL_SOC=y 324CONFIG_FSL_SOC=y
@@ -335,7 +332,6 @@ CONFIG_PCI_SYSCALL=y
335# CONFIG_PCIEPORTBUS is not set 332# CONFIG_PCIEPORTBUS is not set
336CONFIG_ARCH_SUPPORTS_MSI=y 333CONFIG_ARCH_SUPPORTS_MSI=y
337# CONFIG_PCI_MSI is not set 334# CONFIG_PCI_MSI is not set
338# CONFIG_PCI_LEGACY is not set
339# CONFIG_PCI_STUB is not set 335# CONFIG_PCI_STUB is not set
340# CONFIG_PCI_IOV is not set 336# CONFIG_PCI_IOV is not set
341# CONFIG_PCCARD is not set 337# CONFIG_PCCARD is not set
@@ -361,7 +357,6 @@ CONFIG_NET=y
361# Networking options 357# Networking options
362# 358#
363CONFIG_PACKET=y 359CONFIG_PACKET=y
364# CONFIG_PACKET_MMAP is not set
365CONFIG_UNIX=y 360CONFIG_UNIX=y
366CONFIG_XFRM=y 361CONFIG_XFRM=y
367# CONFIG_XFRM_USER is not set 362# CONFIG_XFRM_USER is not set
@@ -549,6 +544,8 @@ CONFIG_MTD_PHYSMAP_OF=y
549# UBI - Unsorted block images 544# UBI - Unsorted block images
550# 545#
551# CONFIG_MTD_UBI is not set 546# CONFIG_MTD_UBI is not set
547CONFIG_OF_FLATTREE=y
548CONFIG_OF_DYNAMIC=y
552CONFIG_OF_DEVICE=y 549CONFIG_OF_DEVICE=y
553CONFIG_OF_GPIO=y 550CONFIG_OF_GPIO=y
554CONFIG_OF_I2C=y 551CONFIG_OF_I2C=y
@@ -586,6 +583,7 @@ CONFIG_MISC_DEVICES=y
586# CONFIG_ENCLOSURE_SERVICES is not set 583# CONFIG_ENCLOSURE_SERVICES is not set
587# CONFIG_HP_ILO is not set 584# CONFIG_HP_ILO is not set
588# CONFIG_ISL29003 is not set 585# CONFIG_ISL29003 is not set
586# CONFIG_SENSORS_TSL2550 is not set
589# CONFIG_DS1682 is not set 587# CONFIG_DS1682 is not set
590# CONFIG_TI_DAC7512 is not set 588# CONFIG_TI_DAC7512 is not set
591# CONFIG_C2PORT is not set 589# CONFIG_C2PORT is not set
@@ -605,6 +603,7 @@ CONFIG_HAVE_IDE=y
605# 603#
606# SCSI device support 604# SCSI device support
607# 605#
606CONFIG_SCSI_MOD=y
608# CONFIG_RAID_ATTRS is not set 607# CONFIG_RAID_ATTRS is not set
609# CONFIG_SCSI is not set 608# CONFIG_SCSI is not set
610# CONFIG_SCSI_DMA is not set 609# CONFIG_SCSI_DMA is not set
@@ -773,6 +772,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
773# CONFIG_SERIAL_JSM is not set 772# CONFIG_SERIAL_JSM is not set
774# CONFIG_SERIAL_OF_PLATFORM is not set 773# CONFIG_SERIAL_OF_PLATFORM is not set
775CONFIG_SERIAL_QE=y 774CONFIG_SERIAL_QE=y
775# CONFIG_SERIAL_TIMBERDALE is not set
776# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 776# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
777CONFIG_UNIX98_PTYS=y 777CONFIG_UNIX98_PTYS=y
778# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 778# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -824,6 +824,7 @@ CONFIG_I2C_HELPER_AUTO=y
824CONFIG_I2C_MPC=y 824CONFIG_I2C_MPC=y
825# CONFIG_I2C_OCORES is not set 825# CONFIG_I2C_OCORES is not set
826# CONFIG_I2C_SIMTEC is not set 826# CONFIG_I2C_SIMTEC is not set
827# CONFIG_I2C_XILINX is not set
827 828
828# 829#
829# External I2C/SMBus adapter drivers 830# External I2C/SMBus adapter drivers
@@ -836,15 +837,9 @@ CONFIG_I2C_MPC=y
836# 837#
837# CONFIG_I2C_PCA_PLATFORM is not set 838# CONFIG_I2C_PCA_PLATFORM is not set
838# CONFIG_I2C_STUB is not set 839# CONFIG_I2C_STUB is not set
839
840#
841# Miscellaneous I2C Chip support
842#
843# CONFIG_SENSORS_TSL2550 is not set
844# CONFIG_I2C_DEBUG_CORE is not set 840# CONFIG_I2C_DEBUG_CORE is not set
845# CONFIG_I2C_DEBUG_ALGO is not set 841# CONFIG_I2C_DEBUG_ALGO is not set
846# CONFIG_I2C_DEBUG_BUS is not set 842# CONFIG_I2C_DEBUG_BUS is not set
847# CONFIG_I2C_DEBUG_CHIP is not set
848CONFIG_SPI=y 843CONFIG_SPI=y
849CONFIG_SPI_MASTER=y 844CONFIG_SPI_MASTER=y
850 845
@@ -875,14 +870,18 @@ CONFIG_GPIOLIB=y
875# 870#
876# Memory mapped GPIO expanders: 871# Memory mapped GPIO expanders:
877# 872#
873# CONFIG_GPIO_IT8761E is not set
878# CONFIG_GPIO_XILINX is not set 874# CONFIG_GPIO_XILINX is not set
875# CONFIG_GPIO_SCH is not set
879 876
880# 877#
881# I2C GPIO expanders: 878# I2C GPIO expanders:
882# 879#
880# CONFIG_GPIO_MAX7300 is not set
883# CONFIG_GPIO_MAX732X is not set 881# CONFIG_GPIO_MAX732X is not set
884# CONFIG_GPIO_PCA953X is not set 882# CONFIG_GPIO_PCA953X is not set
885# CONFIG_GPIO_PCF857X is not set 883# CONFIG_GPIO_PCF857X is not set
884# CONFIG_GPIO_ADP5588 is not set
886 885
887# 886#
888# PCI GPIO expanders: 887# PCI GPIO expanders:
@@ -931,22 +930,27 @@ CONFIG_SSB_POSSIBLE=y
931# Multifunction device drivers 930# Multifunction device drivers
932# 931#
933# CONFIG_MFD_CORE is not set 932# CONFIG_MFD_CORE is not set
933# CONFIG_MFD_88PM860X is not set
934# CONFIG_MFD_SM501 is not set 934# CONFIG_MFD_SM501 is not set
935# CONFIG_HTC_PASIC3 is not set 935# CONFIG_HTC_PASIC3 is not set
936# CONFIG_HTC_I2CPLD is not set
936# CONFIG_TPS65010 is not set 937# CONFIG_TPS65010 is not set
937# CONFIG_TWL4030_CORE is not set 938# CONFIG_TWL4030_CORE is not set
938# CONFIG_MFD_TMIO is not set 939# CONFIG_MFD_TMIO is not set
939# CONFIG_PMIC_DA903X is not set 940# CONFIG_PMIC_DA903X is not set
940# CONFIG_PMIC_ADP5520 is not set 941# CONFIG_PMIC_ADP5520 is not set
942# CONFIG_MFD_MAX8925 is not set
941# CONFIG_MFD_WM8400 is not set 943# CONFIG_MFD_WM8400 is not set
942# CONFIG_MFD_WM831X is not set 944# CONFIG_MFD_WM831X is not set
943# CONFIG_MFD_WM8350_I2C is not set 945# CONFIG_MFD_WM8350_I2C is not set
946# CONFIG_MFD_WM8994 is not set
944# CONFIG_MFD_PCF50633 is not set 947# CONFIG_MFD_PCF50633 is not set
945# CONFIG_MFD_MC13783 is not set 948# CONFIG_MFD_MC13783 is not set
946# CONFIG_AB3100_CORE is not set 949# CONFIG_AB3100_CORE is not set
947# CONFIG_EZX_PCAP is not set 950# CONFIG_EZX_PCAP is not set
948# CONFIG_MFD_88PM8607 is not set
949# CONFIG_AB4500_CORE is not set 951# CONFIG_AB4500_CORE is not set
952# CONFIG_MFD_TIMBERDALE is not set
953# CONFIG_LPC_SCH is not set
950# CONFIG_REGULATOR is not set 954# CONFIG_REGULATOR is not set
951# CONFIG_MEDIA_SUPPORT is not set 955# CONFIG_MEDIA_SUPPORT is not set
952 956
@@ -955,6 +959,7 @@ CONFIG_SSB_POSSIBLE=y
955# 959#
956# CONFIG_AGP is not set 960# CONFIG_AGP is not set
957CONFIG_VGA_ARB=y 961CONFIG_VGA_ARB=y
962CONFIG_VGA_ARB_MAX_GPUS=16
958# CONFIG_DRM is not set 963# CONFIG_DRM is not set
959# CONFIG_VGASTATE is not set 964# CONFIG_VGASTATE is not set
960# CONFIG_VIDEO_OUTPUT_CONTROL is not set 965# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1144,6 +1149,7 @@ CONFIG_JFFS2_ZLIB=y
1144# CONFIG_JFFS2_LZO is not set 1149# CONFIG_JFFS2_LZO is not set
1145CONFIG_JFFS2_RTIME=y 1150CONFIG_JFFS2_RTIME=y
1146# CONFIG_JFFS2_RUBIN is not set 1151# CONFIG_JFFS2_RUBIN is not set
1152# CONFIG_LOGFS is not set
1147# CONFIG_CRAMFS is not set 1153# CONFIG_CRAMFS is not set
1148# CONFIG_SQUASHFS is not set 1154# CONFIG_SQUASHFS is not set
1149# CONFIG_VXFS_FS is not set 1155# CONFIG_VXFS_FS is not set
@@ -1170,6 +1176,7 @@ CONFIG_SUNRPC_GSS=y
1170CONFIG_RPCSEC_GSS_KRB5=y 1176CONFIG_RPCSEC_GSS_KRB5=y
1171# CONFIG_RPCSEC_GSS_SPKM3 is not set 1177# CONFIG_RPCSEC_GSS_SPKM3 is not set
1172# CONFIG_SMB_FS is not set 1178# CONFIG_SMB_FS is not set
1179# CONFIG_CEPH_FS is not set
1173# CONFIG_CIFS is not set 1180# CONFIG_CIFS is not set
1174# CONFIG_NCP_FS is not set 1181# CONFIG_NCP_FS is not set
1175# CONFIG_CODA_FS is not set 1182# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index 62cbb6761d23..0cdb41418d58 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:22 2010 4# Mon Apr 19 23:16:47 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100CONFIG_FAIR_GROUP_SCHED=y
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -323,6 +319,7 @@ CONFIG_ISA_DMA_API=y
323# Bus options 319# Bus options
324# 320#
325CONFIG_ZONE_DMA=y 321CONFIG_ZONE_DMA=y
322# CONFIG_NEED_DMA_MAP_STATE is not set
326CONFIG_GENERIC_ISA_DMA=y 323CONFIG_GENERIC_ISA_DMA=y
327CONFIG_PPC_INDIRECT_PCI=y 324CONFIG_PPC_INDIRECT_PCI=y
328CONFIG_FSL_SOC=y 325CONFIG_FSL_SOC=y
@@ -334,7 +331,6 @@ CONFIG_PCI_SYSCALL=y
334# CONFIG_PCIEPORTBUS is not set 331# CONFIG_PCIEPORTBUS is not set
335CONFIG_ARCH_SUPPORTS_MSI=y 332CONFIG_ARCH_SUPPORTS_MSI=y
336# CONFIG_PCI_MSI is not set 333# CONFIG_PCI_MSI is not set
337# CONFIG_PCI_LEGACY is not set
338# CONFIG_PCI_STUB is not set 334# CONFIG_PCI_STUB is not set
339# CONFIG_PCI_IOV is not set 335# CONFIG_PCI_IOV is not set
340# CONFIG_PCCARD is not set 336# CONFIG_PCCARD is not set
@@ -360,7 +356,6 @@ CONFIG_NET=y
360# Networking options 356# Networking options
361# 357#
362CONFIG_PACKET=y 358CONFIG_PACKET=y
363# CONFIG_PACKET_MMAP is not set
364CONFIG_UNIX=y 359CONFIG_UNIX=y
365CONFIG_XFRM=y 360CONFIG_XFRM=y
366CONFIG_XFRM_USER=m 361CONFIG_XFRM_USER=m
@@ -455,6 +450,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
455# CONFIG_SYS_HYPERVISOR is not set 450# CONFIG_SYS_HYPERVISOR is not set
456# CONFIG_CONNECTOR is not set 451# CONFIG_CONNECTOR is not set
457# CONFIG_MTD is not set 452# CONFIG_MTD is not set
453CONFIG_OF_FLATTREE=y
454CONFIG_OF_DYNAMIC=y
458CONFIG_OF_DEVICE=y 455CONFIG_OF_DEVICE=y
459CONFIG_OF_I2C=y 456CONFIG_OF_I2C=y
460CONFIG_OF_MDIO=y 457CONFIG_OF_MDIO=y
@@ -490,6 +487,7 @@ CONFIG_MISC_DEVICES=y
490# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
491# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
492# CONFIG_ISL29003 is not set 489# CONFIG_ISL29003 is not set
490# CONFIG_SENSORS_TSL2550 is not set
493# CONFIG_DS1682 is not set 491# CONFIG_DS1682 is not set
494# CONFIG_C2PORT is not set 492# CONFIG_C2PORT is not set
495 493
@@ -507,6 +505,7 @@ CONFIG_HAVE_IDE=y
507# 505#
508# SCSI device support 506# SCSI device support
509# 507#
508CONFIG_SCSI_MOD=y
510# CONFIG_RAID_ATTRS is not set 509# CONFIG_RAID_ATTRS is not set
511CONFIG_SCSI=y 510CONFIG_SCSI=y
512CONFIG_SCSI_DMA=y 511CONFIG_SCSI_DMA=y
@@ -630,6 +629,7 @@ CONFIG_ATA_SFF=y
630# CONFIG_PATA_IT821X is not set 629# CONFIG_PATA_IT821X is not set
631# CONFIG_PATA_IT8213 is not set 630# CONFIG_PATA_IT8213 is not set
632# CONFIG_PATA_JMICRON is not set 631# CONFIG_PATA_JMICRON is not set
632# CONFIG_PATA_LEGACY is not set
633# CONFIG_PATA_TRIFLEX is not set 633# CONFIG_PATA_TRIFLEX is not set
634# CONFIG_PATA_MARVELL is not set 634# CONFIG_PATA_MARVELL is not set
635# CONFIG_PATA_MPIIX is not set 635# CONFIG_PATA_MPIIX is not set
@@ -754,6 +754,8 @@ CONFIG_NETDEV_10000=y
754# CONFIG_CHELSIO_T1 is not set 754# CONFIG_CHELSIO_T1 is not set
755CONFIG_CHELSIO_T3_DEPENDS=y 755CONFIG_CHELSIO_T3_DEPENDS=y
756# CONFIG_CHELSIO_T3 is not set 756# CONFIG_CHELSIO_T3 is not set
757CONFIG_CHELSIO_T4_DEPENDS=y
758# CONFIG_CHELSIO_T4 is not set
757# CONFIG_ENIC is not set 759# CONFIG_ENIC is not set
758# CONFIG_IXGBE is not set 760# CONFIG_IXGBE is not set
759# CONFIG_IXGB is not set 761# CONFIG_IXGB is not set
@@ -766,6 +768,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
766# CONFIG_MLX4_CORE is not set 768# CONFIG_MLX4_CORE is not set
767# CONFIG_TEHUTI is not set 769# CONFIG_TEHUTI is not set
768# CONFIG_BNX2X is not set 770# CONFIG_BNX2X is not set
771# CONFIG_QLCNIC is not set
769# CONFIG_QLGE is not set 772# CONFIG_QLGE is not set
770# CONFIG_SFC is not set 773# CONFIG_SFC is not set
771# CONFIG_BE2NET is not set 774# CONFIG_BE2NET is not set
@@ -850,6 +853,7 @@ CONFIG_SERIAL_CORE=y
850CONFIG_SERIAL_CORE_CONSOLE=y 853CONFIG_SERIAL_CORE_CONSOLE=y
851# CONFIG_SERIAL_JSM is not set 854# CONFIG_SERIAL_JSM is not set
852# CONFIG_SERIAL_OF_PLATFORM is not set 855# CONFIG_SERIAL_OF_PLATFORM is not set
856# CONFIG_SERIAL_TIMBERDALE is not set
853# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 857# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
854CONFIG_UNIX98_PTYS=y 858CONFIG_UNIX98_PTYS=y
855# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 859# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -900,6 +904,7 @@ CONFIG_I2C_HELPER_AUTO=y
900CONFIG_I2C_MPC=y 904CONFIG_I2C_MPC=y
901# CONFIG_I2C_OCORES is not set 905# CONFIG_I2C_OCORES is not set
902# CONFIG_I2C_SIMTEC is not set 906# CONFIG_I2C_SIMTEC is not set
907# CONFIG_I2C_XILINX is not set
903 908
904# 909#
905# External I2C/SMBus adapter drivers 910# External I2C/SMBus adapter drivers
@@ -912,15 +917,9 @@ CONFIG_I2C_MPC=y
912# 917#
913# CONFIG_I2C_PCA_PLATFORM is not set 918# CONFIG_I2C_PCA_PLATFORM is not set
914# CONFIG_I2C_STUB is not set 919# CONFIG_I2C_STUB is not set
915
916#
917# Miscellaneous I2C Chip support
918#
919# CONFIG_SENSORS_TSL2550 is not set
920# CONFIG_I2C_DEBUG_CORE is not set 920# CONFIG_I2C_DEBUG_CORE is not set
921# CONFIG_I2C_DEBUG_ALGO is not set 921# CONFIG_I2C_DEBUG_ALGO is not set
922# CONFIG_I2C_DEBUG_BUS is not set 922# CONFIG_I2C_DEBUG_BUS is not set
923# CONFIG_I2C_DEBUG_CHIP is not set
924# CONFIG_SPI is not set 923# CONFIG_SPI is not set
925 924
926# 925#
@@ -946,10 +945,11 @@ CONFIG_HWMON=y
946# CONFIG_SENSORS_ADM1029 is not set 945# CONFIG_SENSORS_ADM1029 is not set
947# CONFIG_SENSORS_ADM1031 is not set 946# CONFIG_SENSORS_ADM1031 is not set
948# CONFIG_SENSORS_ADM9240 is not set 947# CONFIG_SENSORS_ADM9240 is not set
948# CONFIG_SENSORS_ADT7411 is not set
949# CONFIG_SENSORS_ADT7462 is not set 949# CONFIG_SENSORS_ADT7462 is not set
950# CONFIG_SENSORS_ADT7470 is not set 950# CONFIG_SENSORS_ADT7470 is not set
951# CONFIG_SENSORS_ADT7473 is not set
952# CONFIG_SENSORS_ADT7475 is not set 951# CONFIG_SENSORS_ADT7475 is not set
952# CONFIG_SENSORS_ASC7621 is not set
953# CONFIG_SENSORS_ATXP1 is not set 953# CONFIG_SENSORS_ATXP1 is not set
954# CONFIG_SENSORS_DS1621 is not set 954# CONFIG_SENSORS_DS1621 is not set
955# CONFIG_SENSORS_I5K_AMB is not set 955# CONFIG_SENSORS_I5K_AMB is not set
@@ -986,6 +986,7 @@ CONFIG_HWMON=y
986# CONFIG_SENSORS_SMSC47M192 is not set 986# CONFIG_SENSORS_SMSC47M192 is not set
987# CONFIG_SENSORS_SMSC47B397 is not set 987# CONFIG_SENSORS_SMSC47B397 is not set
988# CONFIG_SENSORS_ADS7828 is not set 988# CONFIG_SENSORS_ADS7828 is not set
989# CONFIG_SENSORS_AMC6821 is not set
989# CONFIG_SENSORS_THMC50 is not set 990# CONFIG_SENSORS_THMC50 is not set
990# CONFIG_SENSORS_TMP401 is not set 991# CONFIG_SENSORS_TMP401 is not set
991# CONFIG_SENSORS_TMP421 is not set 992# CONFIG_SENSORS_TMP421 is not set
@@ -1028,18 +1029,21 @@ CONFIG_SSB_POSSIBLE=y
1028# Multifunction device drivers 1029# Multifunction device drivers
1029# 1030#
1030# CONFIG_MFD_CORE is not set 1031# CONFIG_MFD_CORE is not set
1032# CONFIG_MFD_88PM860X is not set
1031# CONFIG_MFD_SM501 is not set 1033# CONFIG_MFD_SM501 is not set
1032# CONFIG_HTC_PASIC3 is not set 1034# CONFIG_HTC_PASIC3 is not set
1033# CONFIG_TWL4030_CORE is not set 1035# CONFIG_TWL4030_CORE is not set
1034# CONFIG_MFD_TMIO is not set 1036# CONFIG_MFD_TMIO is not set
1035# CONFIG_PMIC_DA903X is not set 1037# CONFIG_PMIC_DA903X is not set
1036# CONFIG_PMIC_ADP5520 is not set 1038# CONFIG_PMIC_ADP5520 is not set
1039# CONFIG_MFD_MAX8925 is not set
1037# CONFIG_MFD_WM8400 is not set 1040# CONFIG_MFD_WM8400 is not set
1038# CONFIG_MFD_WM831X is not set 1041# CONFIG_MFD_WM831X is not set
1039# CONFIG_MFD_WM8350_I2C is not set 1042# CONFIG_MFD_WM8350_I2C is not set
1043# CONFIG_MFD_WM8994 is not set
1040# CONFIG_MFD_PCF50633 is not set 1044# CONFIG_MFD_PCF50633 is not set
1041# CONFIG_AB3100_CORE is not set 1045# CONFIG_AB3100_CORE is not set
1042# CONFIG_MFD_88PM8607 is not set 1046# CONFIG_LPC_SCH is not set
1043# CONFIG_REGULATOR is not set 1047# CONFIG_REGULATOR is not set
1044# CONFIG_MEDIA_SUPPORT is not set 1048# CONFIG_MEDIA_SUPPORT is not set
1045 1049
@@ -1048,6 +1052,7 @@ CONFIG_SSB_POSSIBLE=y
1048# 1052#
1049# CONFIG_AGP is not set 1053# CONFIG_AGP is not set
1050CONFIG_VGA_ARB=y 1054CONFIG_VGA_ARB=y
1055CONFIG_VGA_ARB_MAX_GPUS=16
1051# CONFIG_DRM is not set 1056# CONFIG_DRM is not set
1052# CONFIG_VGASTATE is not set 1057# CONFIG_VGASTATE is not set
1053CONFIG_VIDEO_OUTPUT_CONTROL=m 1058CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1174,6 +1179,7 @@ CONFIG_MISC_FILESYSTEMS=y
1174# CONFIG_BEFS_FS is not set 1179# CONFIG_BEFS_FS is not set
1175# CONFIG_BFS_FS is not set 1180# CONFIG_BFS_FS is not set
1176# CONFIG_EFS_FS is not set 1181# CONFIG_EFS_FS is not set
1182# CONFIG_LOGFS is not set
1177# CONFIG_CRAMFS is not set 1183# CONFIG_CRAMFS is not set
1178# CONFIG_SQUASHFS is not set 1184# CONFIG_SQUASHFS is not set
1179# CONFIG_VXFS_FS is not set 1185# CONFIG_VXFS_FS is not set
@@ -1200,6 +1206,7 @@ CONFIG_SUNRPC_GSS=y
1200CONFIG_RPCSEC_GSS_KRB5=y 1206CONFIG_RPCSEC_GSS_KRB5=y
1201# CONFIG_RPCSEC_GSS_SPKM3 is not set 1207# CONFIG_RPCSEC_GSS_SPKM3 is not set
1202# CONFIG_SMB_FS is not set 1208# CONFIG_SMB_FS is not set
1209# CONFIG_CEPH_FS is not set
1203# CONFIG_CIFS is not set 1210# CONFIG_CIFS is not set
1204# CONFIG_NCP_FS is not set 1211# CONFIG_NCP_FS is not set
1205# CONFIG_CODA_FS is not set 1212# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index 82873f57636d..e69ed1b61425 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:24 2010 4# Mon Apr 19 23:16:48 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100CONFIG_FAIR_GROUP_SCHED=y
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -323,6 +319,7 @@ CONFIG_ISA_DMA_API=y
323# Bus options 319# Bus options
324# 320#
325CONFIG_ZONE_DMA=y 321CONFIG_ZONE_DMA=y
322# CONFIG_NEED_DMA_MAP_STATE is not set
326CONFIG_GENERIC_ISA_DMA=y 323CONFIG_GENERIC_ISA_DMA=y
327CONFIG_PPC_INDIRECT_PCI=y 324CONFIG_PPC_INDIRECT_PCI=y
328CONFIG_FSL_SOC=y 325CONFIG_FSL_SOC=y
@@ -334,7 +331,6 @@ CONFIG_PCI_SYSCALL=y
334# CONFIG_PCIEPORTBUS is not set 331# CONFIG_PCIEPORTBUS is not set
335CONFIG_ARCH_SUPPORTS_MSI=y 332CONFIG_ARCH_SUPPORTS_MSI=y
336# CONFIG_PCI_MSI is not set 333# CONFIG_PCI_MSI is not set
337# CONFIG_PCI_LEGACY is not set
338# CONFIG_PCI_STUB is not set 334# CONFIG_PCI_STUB is not set
339# CONFIG_PCI_IOV is not set 335# CONFIG_PCI_IOV is not set
340# CONFIG_PCCARD is not set 336# CONFIG_PCCARD is not set
@@ -360,7 +356,6 @@ CONFIG_NET=y
360# Networking options 356# Networking options
361# 357#
362CONFIG_PACKET=y 358CONFIG_PACKET=y
363# CONFIG_PACKET_MMAP is not set
364CONFIG_UNIX=y 359CONFIG_UNIX=y
365# CONFIG_NET_KEY is not set 360# CONFIG_NET_KEY is not set
366CONFIG_INET=y 361CONFIG_INET=y
@@ -450,6 +445,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
450# CONFIG_SYS_HYPERVISOR is not set 445# CONFIG_SYS_HYPERVISOR is not set
451# CONFIG_CONNECTOR is not set 446# CONFIG_CONNECTOR is not set
452# CONFIG_MTD is not set 447# CONFIG_MTD is not set
448CONFIG_OF_FLATTREE=y
449CONFIG_OF_DYNAMIC=y
453CONFIG_OF_DEVICE=y 450CONFIG_OF_DEVICE=y
454CONFIG_OF_I2C=y 451CONFIG_OF_I2C=y
455CONFIG_OF_MDIO=y 452CONFIG_OF_MDIO=y
@@ -486,6 +483,7 @@ CONFIG_MISC_DEVICES=y
486# CONFIG_ENCLOSURE_SERVICES is not set 483# CONFIG_ENCLOSURE_SERVICES is not set
487# CONFIG_HP_ILO is not set 484# CONFIG_HP_ILO is not set
488# CONFIG_ISL29003 is not set 485# CONFIG_ISL29003 is not set
486# CONFIG_SENSORS_TSL2550 is not set
489# CONFIG_DS1682 is not set 487# CONFIG_DS1682 is not set
490# CONFIG_C2PORT is not set 488# CONFIG_C2PORT is not set
491 489
@@ -503,6 +501,7 @@ CONFIG_HAVE_IDE=y
503# 501#
504# SCSI device support 502# SCSI device support
505# 503#
504CONFIG_SCSI_MOD=y
506# CONFIG_RAID_ATTRS is not set 505# CONFIG_RAID_ATTRS is not set
507CONFIG_SCSI=y 506CONFIG_SCSI=y
508CONFIG_SCSI_DMA=y 507CONFIG_SCSI_DMA=y
@@ -625,6 +624,7 @@ CONFIG_ATA_SFF=y
625# CONFIG_PATA_IT821X is not set 624# CONFIG_PATA_IT821X is not set
626# CONFIG_PATA_IT8213 is not set 625# CONFIG_PATA_IT8213 is not set
627# CONFIG_PATA_JMICRON is not set 626# CONFIG_PATA_JMICRON is not set
627# CONFIG_PATA_LEGACY is not set
628# CONFIG_PATA_TRIFLEX is not set 628# CONFIG_PATA_TRIFLEX is not set
629# CONFIG_PATA_MARVELL is not set 629# CONFIG_PATA_MARVELL is not set
630# CONFIG_PATA_MPIIX is not set 630# CONFIG_PATA_MPIIX is not set
@@ -849,6 +849,7 @@ CONFIG_SERIAL_CORE=y
849CONFIG_SERIAL_CORE_CONSOLE=y 849CONFIG_SERIAL_CORE_CONSOLE=y
850# CONFIG_SERIAL_JSM is not set 850# CONFIG_SERIAL_JSM is not set
851# CONFIG_SERIAL_OF_PLATFORM is not set 851# CONFIG_SERIAL_OF_PLATFORM is not set
852# CONFIG_SERIAL_TIMBERDALE is not set
852# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 853# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
853CONFIG_UNIX98_PTYS=y 854CONFIG_UNIX98_PTYS=y
854# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 855# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -899,6 +900,7 @@ CONFIG_I2C_HELPER_AUTO=y
899CONFIG_I2C_MPC=y 900CONFIG_I2C_MPC=y
900# CONFIG_I2C_OCORES is not set 901# CONFIG_I2C_OCORES is not set
901# CONFIG_I2C_SIMTEC is not set 902# CONFIG_I2C_SIMTEC is not set
903# CONFIG_I2C_XILINX is not set
902 904
903# 905#
904# External I2C/SMBus adapter drivers 906# External I2C/SMBus adapter drivers
@@ -912,15 +914,9 @@ CONFIG_I2C_MPC=y
912# 914#
913# CONFIG_I2C_PCA_PLATFORM is not set 915# CONFIG_I2C_PCA_PLATFORM is not set
914# CONFIG_I2C_STUB is not set 916# CONFIG_I2C_STUB is not set
915
916#
917# Miscellaneous I2C Chip support
918#
919# CONFIG_SENSORS_TSL2550 is not set
920# CONFIG_I2C_DEBUG_CORE is not set 917# CONFIG_I2C_DEBUG_CORE is not set
921# CONFIG_I2C_DEBUG_ALGO is not set 918# CONFIG_I2C_DEBUG_ALGO is not set
922# CONFIG_I2C_DEBUG_BUS is not set 919# CONFIG_I2C_DEBUG_BUS is not set
923# CONFIG_I2C_DEBUG_CHIP is not set
924# CONFIG_SPI is not set 920# CONFIG_SPI is not set
925 921
926# 922#
@@ -946,10 +942,11 @@ CONFIG_HWMON=y
946# CONFIG_SENSORS_ADM1029 is not set 942# CONFIG_SENSORS_ADM1029 is not set
947# CONFIG_SENSORS_ADM1031 is not set 943# CONFIG_SENSORS_ADM1031 is not set
948# CONFIG_SENSORS_ADM9240 is not set 944# CONFIG_SENSORS_ADM9240 is not set
945# CONFIG_SENSORS_ADT7411 is not set
949# CONFIG_SENSORS_ADT7462 is not set 946# CONFIG_SENSORS_ADT7462 is not set
950# CONFIG_SENSORS_ADT7470 is not set 947# CONFIG_SENSORS_ADT7470 is not set
951# CONFIG_SENSORS_ADT7473 is not set
952# CONFIG_SENSORS_ADT7475 is not set 948# CONFIG_SENSORS_ADT7475 is not set
949# CONFIG_SENSORS_ASC7621 is not set
953# CONFIG_SENSORS_ATXP1 is not set 950# CONFIG_SENSORS_ATXP1 is not set
954# CONFIG_SENSORS_DS1621 is not set 951# CONFIG_SENSORS_DS1621 is not set
955# CONFIG_SENSORS_I5K_AMB is not set 952# CONFIG_SENSORS_I5K_AMB is not set
@@ -986,6 +983,7 @@ CONFIG_HWMON=y
986# CONFIG_SENSORS_SMSC47M192 is not set 983# CONFIG_SENSORS_SMSC47M192 is not set
987# CONFIG_SENSORS_SMSC47B397 is not set 984# CONFIG_SENSORS_SMSC47B397 is not set
988# CONFIG_SENSORS_ADS7828 is not set 985# CONFIG_SENSORS_ADS7828 is not set
986# CONFIG_SENSORS_AMC6821 is not set
989# CONFIG_SENSORS_THMC50 is not set 987# CONFIG_SENSORS_THMC50 is not set
990# CONFIG_SENSORS_TMP401 is not set 988# CONFIG_SENSORS_TMP401 is not set
991# CONFIG_SENSORS_TMP421 is not set 989# CONFIG_SENSORS_TMP421 is not set
@@ -1033,18 +1031,21 @@ CONFIG_SSB_POSSIBLE=y
1033# Multifunction device drivers 1031# Multifunction device drivers
1034# 1032#
1035# CONFIG_MFD_CORE is not set 1033# CONFIG_MFD_CORE is not set
1034# CONFIG_MFD_88PM860X is not set
1036# CONFIG_MFD_SM501 is not set 1035# CONFIG_MFD_SM501 is not set
1037# CONFIG_HTC_PASIC3 is not set 1036# CONFIG_HTC_PASIC3 is not set
1038# CONFIG_TWL4030_CORE is not set 1037# CONFIG_TWL4030_CORE is not set
1039# CONFIG_MFD_TMIO is not set 1038# CONFIG_MFD_TMIO is not set
1040# CONFIG_PMIC_DA903X is not set 1039# CONFIG_PMIC_DA903X is not set
1041# CONFIG_PMIC_ADP5520 is not set 1040# CONFIG_PMIC_ADP5520 is not set
1041# CONFIG_MFD_MAX8925 is not set
1042# CONFIG_MFD_WM8400 is not set 1042# CONFIG_MFD_WM8400 is not set
1043# CONFIG_MFD_WM831X is not set 1043# CONFIG_MFD_WM831X is not set
1044# CONFIG_MFD_WM8350_I2C is not set 1044# CONFIG_MFD_WM8350_I2C is not set
1045# CONFIG_MFD_WM8994 is not set
1045# CONFIG_MFD_PCF50633 is not set 1046# CONFIG_MFD_PCF50633 is not set
1046# CONFIG_AB3100_CORE is not set 1047# CONFIG_AB3100_CORE is not set
1047# CONFIG_MFD_88PM8607 is not set 1048# CONFIG_LPC_SCH is not set
1048# CONFIG_REGULATOR is not set 1049# CONFIG_REGULATOR is not set
1049# CONFIG_MEDIA_SUPPORT is not set 1050# CONFIG_MEDIA_SUPPORT is not set
1050 1051
@@ -1053,6 +1054,7 @@ CONFIG_SSB_POSSIBLE=y
1053# 1054#
1054# CONFIG_AGP is not set 1055# CONFIG_AGP is not set
1055CONFIG_VGA_ARB=y 1056CONFIG_VGA_ARB=y
1057CONFIG_VGA_ARB_MAX_GPUS=16
1056# CONFIG_DRM is not set 1058# CONFIG_DRM is not set
1057# CONFIG_VGASTATE is not set 1059# CONFIG_VGASTATE is not set
1058CONFIG_VIDEO_OUTPUT_CONTROL=m 1060CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1078,6 +1080,7 @@ CONFIG_USB_HID=y
1078# 1080#
1079# Special HID drivers 1081# Special HID drivers
1080# 1082#
1083# CONFIG_HID_3M_PCT is not set
1081CONFIG_HID_A4TECH=y 1084CONFIG_HID_A4TECH=y
1082CONFIG_HID_APPLE=y 1085CONFIG_HID_APPLE=y
1083CONFIG_HID_BELKIN=y 1086CONFIG_HID_BELKIN=y
@@ -1093,14 +1096,19 @@ CONFIG_HID_GYRATION=y
1093CONFIG_HID_LOGITECH=y 1096CONFIG_HID_LOGITECH=y
1094# CONFIG_LOGITECH_FF is not set 1097# CONFIG_LOGITECH_FF is not set
1095# CONFIG_LOGIRUMBLEPAD2_FF is not set 1098# CONFIG_LOGIRUMBLEPAD2_FF is not set
1099# CONFIG_LOGIG940_FF is not set
1096CONFIG_HID_MICROSOFT=y 1100CONFIG_HID_MICROSOFT=y
1101# CONFIG_HID_MOSART is not set
1097CONFIG_HID_MONTEREY=y 1102CONFIG_HID_MONTEREY=y
1098# CONFIG_HID_NTRIG is not set 1103# CONFIG_HID_NTRIG is not set
1104# CONFIG_HID_ORTEK is not set
1099CONFIG_HID_PANTHERLORD=y 1105CONFIG_HID_PANTHERLORD=y
1100# CONFIG_PANTHERLORD_FF is not set 1106# CONFIG_PANTHERLORD_FF is not set
1101CONFIG_HID_PETALYNX=y 1107CONFIG_HID_PETALYNX=y
1108# CONFIG_HID_QUANTA is not set
1102CONFIG_HID_SAMSUNG=y 1109CONFIG_HID_SAMSUNG=y
1103CONFIG_HID_SONY=y 1110CONFIG_HID_SONY=y
1111# CONFIG_HID_STANTUM is not set
1104CONFIG_HID_SUNPLUS=y 1112CONFIG_HID_SUNPLUS=y
1105# CONFIG_HID_GREENASIA is not set 1113# CONFIG_HID_GREENASIA is not set
1106# CONFIG_HID_SMARTJOYPLUS is not set 1114# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1189,7 +1197,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1189# CONFIG_USB_RIO500 is not set 1197# CONFIG_USB_RIO500 is not set
1190# CONFIG_USB_LEGOTOWER is not set 1198# CONFIG_USB_LEGOTOWER is not set
1191# CONFIG_USB_LCD is not set 1199# CONFIG_USB_LCD is not set
1192# CONFIG_USB_BERRY_CHARGE is not set
1193# CONFIG_USB_LED is not set 1200# CONFIG_USB_LED is not set
1194# CONFIG_USB_CYPRESS_CY7C63 is not set 1201# CONFIG_USB_CYPRESS_CY7C63 is not set
1195# CONFIG_USB_CYTHERM is not set 1202# CONFIG_USB_CYTHERM is not set
@@ -1202,7 +1209,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1202# CONFIG_USB_IOWARRIOR is not set 1209# CONFIG_USB_IOWARRIOR is not set
1203# CONFIG_USB_TEST is not set 1210# CONFIG_USB_TEST is not set
1204# CONFIG_USB_ISIGHTFW is not set 1211# CONFIG_USB_ISIGHTFW is not set
1205# CONFIG_USB_VST is not set
1206# CONFIG_USB_GADGET is not set 1212# CONFIG_USB_GADGET is not set
1207 1213
1208# 1214#
@@ -1296,6 +1302,7 @@ CONFIG_MISC_FILESYSTEMS=y
1296# CONFIG_BEFS_FS is not set 1302# CONFIG_BEFS_FS is not set
1297# CONFIG_BFS_FS is not set 1303# CONFIG_BFS_FS is not set
1298# CONFIG_EFS_FS is not set 1304# CONFIG_EFS_FS is not set
1305# CONFIG_LOGFS is not set
1299# CONFIG_CRAMFS is not set 1306# CONFIG_CRAMFS is not set
1300# CONFIG_SQUASHFS is not set 1307# CONFIG_SQUASHFS is not set
1301# CONFIG_VXFS_FS is not set 1308# CONFIG_VXFS_FS is not set
@@ -1322,6 +1329,7 @@ CONFIG_SUNRPC_GSS=y
1322CONFIG_RPCSEC_GSS_KRB5=y 1329CONFIG_RPCSEC_GSS_KRB5=y
1323# CONFIG_RPCSEC_GSS_SPKM3 is not set 1330# CONFIG_RPCSEC_GSS_SPKM3 is not set
1324# CONFIG_SMB_FS is not set 1331# CONFIG_SMB_FS is not set
1332# CONFIG_CEPH_FS is not set
1325# CONFIG_CIFS is not set 1333# CONFIG_CIFS is not set
1326# CONFIG_NCP_FS is not set 1334# CONFIG_NCP_FS is not set
1327# CONFIG_CODA_FS is not set 1335# CONFIG_CODA_FS is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 5997c4eec27f..56e3995d898f 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.33-rc3 3# Linux kernel version: 2.6.34-rc5
4# Wed Jan 6 09:24:25 2010 4# Mon Apr 19 23:16:49 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,11 +96,6 @@ CONFIG_RCU_FANOUT=32
96# CONFIG_TREE_RCU_TRACE is not set 96# CONFIG_TREE_RCU_TRACE is not set
97# CONFIG_IKCONFIG is not set 97# CONFIG_IKCONFIG is not set
98CONFIG_LOG_BUF_SHIFT=14 98CONFIG_LOG_BUF_SHIFT=14
99CONFIG_GROUP_SCHED=y
100CONFIG_FAIR_GROUP_SCHED=y
101# CONFIG_RT_GROUP_SCHED is not set
102CONFIG_USER_SCHED=y
103# CONFIG_CGROUP_SCHED is not set
104# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
105# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
106# CONFIG_RELAY is not set 101# CONFIG_RELAY is not set
@@ -110,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y 105CONFIG_RD_GZIP=y
111# CONFIG_RD_BZIP2 is not set 106# CONFIG_RD_BZIP2 is not set
112# CONFIG_RD_LZMA is not set 107# CONFIG_RD_LZMA is not set
108# CONFIG_RD_LZO is not set
113# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
114CONFIG_SYSCTL=y 110CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
@@ -321,6 +317,7 @@ CONFIG_ISA_DMA_API=y
321# Bus options 317# Bus options
322# 318#
323CONFIG_ZONE_DMA=y 319CONFIG_ZONE_DMA=y
320# CONFIG_NEED_DMA_MAP_STATE is not set
324CONFIG_GENERIC_ISA_DMA=y 321CONFIG_GENERIC_ISA_DMA=y
325CONFIG_PPC_INDIRECT_PCI=y 322CONFIG_PPC_INDIRECT_PCI=y
326CONFIG_FSL_SOC=y 323CONFIG_FSL_SOC=y
@@ -332,7 +329,6 @@ CONFIG_PCI_SYSCALL=y
332# CONFIG_PCIEPORTBUS is not set 329# CONFIG_PCIEPORTBUS is not set
333CONFIG_ARCH_SUPPORTS_MSI=y 330CONFIG_ARCH_SUPPORTS_MSI=y
334# CONFIG_PCI_MSI is not set 331# CONFIG_PCI_MSI is not set
335# CONFIG_PCI_LEGACY is not set
336# CONFIG_PCI_STUB is not set 332# CONFIG_PCI_STUB is not set
337# CONFIG_PCI_IOV is not set 333# CONFIG_PCI_IOV is not set
338# CONFIG_PCCARD is not set 334# CONFIG_PCCARD is not set
@@ -358,7 +354,6 @@ CONFIG_NET=y
358# Networking options 354# Networking options
359# 355#
360CONFIG_PACKET=y 356CONFIG_PACKET=y
361# CONFIG_PACKET_MMAP is not set
362CONFIG_UNIX=y 357CONFIG_UNIX=y
363CONFIG_XFRM=y 358CONFIG_XFRM=y
364CONFIG_XFRM_USER=m 359CONFIG_XFRM_USER=m
@@ -536,6 +531,8 @@ CONFIG_MTD_PHYSMAP_OF=y
536# UBI - Unsorted block images 531# UBI - Unsorted block images
537# 532#
538# CONFIG_MTD_UBI is not set 533# CONFIG_MTD_UBI is not set
534CONFIG_OF_FLATTREE=y
535CONFIG_OF_DYNAMIC=y
539CONFIG_OF_DEVICE=y 536CONFIG_OF_DEVICE=y
540CONFIG_OF_I2C=y 537CONFIG_OF_I2C=y
541CONFIG_OF_MDIO=y 538CONFIG_OF_MDIO=y
@@ -572,6 +569,7 @@ CONFIG_MISC_DEVICES=y
572# CONFIG_ENCLOSURE_SERVICES is not set 569# CONFIG_ENCLOSURE_SERVICES is not set
573# CONFIG_HP_ILO is not set 570# CONFIG_HP_ILO is not set
574# CONFIG_ISL29003 is not set 571# CONFIG_ISL29003 is not set
572# CONFIG_SENSORS_TSL2550 is not set
575# CONFIG_DS1682 is not set 573# CONFIG_DS1682 is not set
576# CONFIG_C2PORT is not set 574# CONFIG_C2PORT is not set
577 575
@@ -589,6 +587,7 @@ CONFIG_HAVE_IDE=y
589# 587#
590# SCSI device support 588# SCSI device support
591# 589#
590CONFIG_SCSI_MOD=y
592# CONFIG_RAID_ATTRS is not set 591# CONFIG_RAID_ATTRS is not set
593CONFIG_SCSI=y 592CONFIG_SCSI=y
594CONFIG_SCSI_DMA=y 593CONFIG_SCSI_DMA=y
@@ -811,6 +810,7 @@ CONFIG_SERIAL_CORE=y
811CONFIG_SERIAL_CORE_CONSOLE=y 810CONFIG_SERIAL_CORE_CONSOLE=y
812# CONFIG_SERIAL_JSM is not set 811# CONFIG_SERIAL_JSM is not set
813# CONFIG_SERIAL_OF_PLATFORM is not set 812# CONFIG_SERIAL_OF_PLATFORM is not set
813# CONFIG_SERIAL_TIMBERDALE is not set
814# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 814# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
815CONFIG_UNIX98_PTYS=y 815CONFIG_UNIX98_PTYS=y
816# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 816# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -861,6 +861,7 @@ CONFIG_I2C_HELPER_AUTO=y
861CONFIG_I2C_MPC=y 861CONFIG_I2C_MPC=y
862# CONFIG_I2C_OCORES is not set 862# CONFIG_I2C_OCORES is not set
863# CONFIG_I2C_SIMTEC is not set 863# CONFIG_I2C_SIMTEC is not set
864# CONFIG_I2C_XILINX is not set
864 865
865# 866#
866# External I2C/SMBus adapter drivers 867# External I2C/SMBus adapter drivers
@@ -874,15 +875,9 @@ CONFIG_I2C_MPC=y
874# 875#
875# CONFIG_I2C_PCA_PLATFORM is not set 876# CONFIG_I2C_PCA_PLATFORM is not set
876# CONFIG_I2C_STUB is not set 877# CONFIG_I2C_STUB is not set
877
878#
879# Miscellaneous I2C Chip support
880#
881# CONFIG_SENSORS_TSL2550 is not set
882# CONFIG_I2C_DEBUG_CORE is not set 878# CONFIG_I2C_DEBUG_CORE is not set
883# CONFIG_I2C_DEBUG_ALGO is not set 879# CONFIG_I2C_DEBUG_ALGO is not set
884# CONFIG_I2C_DEBUG_BUS is not set 880# CONFIG_I2C_DEBUG_BUS is not set
885# CONFIG_I2C_DEBUG_CHIP is not set
886# CONFIG_SPI is not set 881# CONFIG_SPI is not set
887 882
888# 883#
@@ -908,10 +903,11 @@ CONFIG_HWMON=y
908# CONFIG_SENSORS_ADM1029 is not set 903# CONFIG_SENSORS_ADM1029 is not set
909# CONFIG_SENSORS_ADM1031 is not set 904# CONFIG_SENSORS_ADM1031 is not set
910# CONFIG_SENSORS_ADM9240 is not set 905# CONFIG_SENSORS_ADM9240 is not set
906# CONFIG_SENSORS_ADT7411 is not set
911# CONFIG_SENSORS_ADT7462 is not set 907# CONFIG_SENSORS_ADT7462 is not set
912# CONFIG_SENSORS_ADT7470 is not set 908# CONFIG_SENSORS_ADT7470 is not set
913# CONFIG_SENSORS_ADT7473 is not set
914# CONFIG_SENSORS_ADT7475 is not set 909# CONFIG_SENSORS_ADT7475 is not set
910# CONFIG_SENSORS_ASC7621 is not set
915# CONFIG_SENSORS_ATXP1 is not set 911# CONFIG_SENSORS_ATXP1 is not set
916# CONFIG_SENSORS_DS1621 is not set 912# CONFIG_SENSORS_DS1621 is not set
917# CONFIG_SENSORS_I5K_AMB is not set 913# CONFIG_SENSORS_I5K_AMB is not set
@@ -948,6 +944,7 @@ CONFIG_HWMON=y
948# CONFIG_SENSORS_SMSC47M192 is not set 944# CONFIG_SENSORS_SMSC47M192 is not set
949# CONFIG_SENSORS_SMSC47B397 is not set 945# CONFIG_SENSORS_SMSC47B397 is not set
950# CONFIG_SENSORS_ADS7828 is not set 946# CONFIG_SENSORS_ADS7828 is not set
947# CONFIG_SENSORS_AMC6821 is not set
951# CONFIG_SENSORS_THMC50 is not set 948# CONFIG_SENSORS_THMC50 is not set
952# CONFIG_SENSORS_TMP401 is not set 949# CONFIG_SENSORS_TMP401 is not set
953# CONFIG_SENSORS_TMP421 is not set 950# CONFIG_SENSORS_TMP421 is not set
@@ -995,18 +992,21 @@ CONFIG_SSB_POSSIBLE=y
995# Multifunction device drivers 992# Multifunction device drivers
996# 993#
997# CONFIG_MFD_CORE is not set 994# CONFIG_MFD_CORE is not set
995# CONFIG_MFD_88PM860X is not set
998# CONFIG_MFD_SM501 is not set 996# CONFIG_MFD_SM501 is not set
999# CONFIG_HTC_PASIC3 is not set 997# CONFIG_HTC_PASIC3 is not set
1000# CONFIG_TWL4030_CORE is not set 998# CONFIG_TWL4030_CORE is not set
1001# CONFIG_MFD_TMIO is not set 999# CONFIG_MFD_TMIO is not set
1002# CONFIG_PMIC_DA903X is not set 1000# CONFIG_PMIC_DA903X is not set
1003# CONFIG_PMIC_ADP5520 is not set 1001# CONFIG_PMIC_ADP5520 is not set
1002# CONFIG_MFD_MAX8925 is not set
1004# CONFIG_MFD_WM8400 is not set 1003# CONFIG_MFD_WM8400 is not set
1005# CONFIG_MFD_WM831X is not set 1004# CONFIG_MFD_WM831X is not set
1006# CONFIG_MFD_WM8350_I2C is not set 1005# CONFIG_MFD_WM8350_I2C is not set
1006# CONFIG_MFD_WM8994 is not set
1007# CONFIG_MFD_PCF50633 is not set 1007# CONFIG_MFD_PCF50633 is not set
1008# CONFIG_AB3100_CORE is not set 1008# CONFIG_AB3100_CORE is not set
1009# CONFIG_MFD_88PM8607 is not set 1009# CONFIG_LPC_SCH is not set
1010# CONFIG_REGULATOR is not set 1010# CONFIG_REGULATOR is not set
1011# CONFIG_MEDIA_SUPPORT is not set 1011# CONFIG_MEDIA_SUPPORT is not set
1012 1012
@@ -1015,6 +1015,7 @@ CONFIG_SSB_POSSIBLE=y
1015# 1015#
1016# CONFIG_AGP is not set 1016# CONFIG_AGP is not set
1017CONFIG_VGA_ARB=y 1017CONFIG_VGA_ARB=y
1018CONFIG_VGA_ARB_MAX_GPUS=16
1018# CONFIG_DRM is not set 1019# CONFIG_DRM is not set
1019# CONFIG_VGASTATE is not set 1020# CONFIG_VGASTATE is not set
1020# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1021# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1139,7 +1140,6 @@ CONFIG_USB_STORAGE=y
1139# CONFIG_USB_RIO500 is not set 1140# CONFIG_USB_RIO500 is not set
1140# CONFIG_USB_LEGOTOWER is not set 1141# CONFIG_USB_LEGOTOWER is not set
1141# CONFIG_USB_LCD is not set 1142# CONFIG_USB_LCD is not set
1142# CONFIG_USB_BERRY_CHARGE is not set
1143# CONFIG_USB_LED is not set 1143# CONFIG_USB_LED is not set
1144# CONFIG_USB_CYPRESS_CY7C63 is not set 1144# CONFIG_USB_CYPRESS_CY7C63 is not set
1145# CONFIG_USB_CYTHERM is not set 1145# CONFIG_USB_CYTHERM is not set
@@ -1152,7 +1152,6 @@ CONFIG_USB_STORAGE=y
1152# CONFIG_USB_IOWARRIOR is not set 1152# CONFIG_USB_IOWARRIOR is not set
1153# CONFIG_USB_TEST is not set 1153# CONFIG_USB_TEST is not set
1154# CONFIG_USB_ISIGHTFW is not set 1154# CONFIG_USB_ISIGHTFW is not set
1155# CONFIG_USB_VST is not set
1156# CONFIG_USB_GADGET is not set 1155# CONFIG_USB_GADGET is not set
1157 1156
1158# 1157#
@@ -1244,6 +1243,7 @@ CONFIG_MISC_FILESYSTEMS=y
1244# CONFIG_BFS_FS is not set 1243# CONFIG_BFS_FS is not set
1245# CONFIG_EFS_FS is not set 1244# CONFIG_EFS_FS is not set
1246# CONFIG_JFFS2_FS is not set 1245# CONFIG_JFFS2_FS is not set
1246# CONFIG_LOGFS is not set
1247# CONFIG_CRAMFS is not set 1247# CONFIG_CRAMFS is not set
1248# CONFIG_SQUASHFS is not set 1248# CONFIG_SQUASHFS is not set
1249# CONFIG_VXFS_FS is not set 1249# CONFIG_VXFS_FS is not set
@@ -1270,6 +1270,7 @@ CONFIG_SUNRPC_GSS=y
1270CONFIG_RPCSEC_GSS_KRB5=y 1270CONFIG_RPCSEC_GSS_KRB5=y
1271# CONFIG_RPCSEC_GSS_SPKM3 is not set 1271# CONFIG_RPCSEC_GSS_SPKM3 is not set
1272# CONFIG_SMB_FS is not set 1272# CONFIG_SMB_FS is not set
1273# CONFIG_CEPH_FS is not set
1273# CONFIG_CIFS is not set 1274# CONFIG_CIFS is not set
1274# CONFIG_NCP_FS is not set 1275# CONFIG_NCP_FS is not set
1275# CONFIG_CODA_FS is not set 1276# CONFIG_CODA_FS is not set
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-11 11:27:55 -0500