aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 20:01:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 20:01:19 -0400
commit9d20593a722c2dab7a5ab74f5d8c9b604aca52f9 (patch)
treeb5492b3191f29f68018c4d76f41f8bab379db0c5 /arch/powerpc
parent9b59a0a4eefa132a3899b6e8d362f92559c67844 (diff)
parent9205124c66a69664c6825501cb062ebd2acd3b3a (diff)
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6: powerpc/5200: Build fix for mpc52xx watchdog timer code of: Fix comparison of "compatible" properties powerpc/52xx: update defconfigs spi/omap2_mcspi: Use transaction speed if provided spi/omap2_mcspi: fix NULL pointer dereference uartlite: Fix build on sparc.
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/configs/52xx/cm5200_defconfig24
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig28
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig25
-rw-r--r--arch/powerpc/configs/52xx/pcm030_defconfig27
-rw-r--r--arch/powerpc/configs/52xx/tqm5200_defconfig28
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig134
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_gpt.c6
7 files changed, 165 insertions, 107 deletions
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig
index ff9bdb28197d..218d49b36a0c 100644
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.33-rc2 3# Linux kernel version: 2.6.34-rc1
4# Wed Dec 30 14:45:07 2009 4# Wed Mar 10 14:34:22 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -94,11 +94,6 @@ CONFIG_RCU_FANOUT=32
94# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
96CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
97CONFIG_GROUP_SCHED=y
98CONFIG_FAIR_GROUP_SCHED=y
99# CONFIG_RT_GROUP_SCHED is not set
100CONFIG_USER_SCHED=y
101# CONFIG_CGROUP_SCHED is not set
102# CONFIG_CGROUPS is not set 97# CONFIG_CGROUPS is not set
103CONFIG_SYSFS_DEPRECATED=y 98CONFIG_SYSFS_DEPRECATED=y
104CONFIG_SYSFS_DEPRECATED_V2=y 99CONFIG_SYSFS_DEPRECATED_V2=y
@@ -109,6 +104,7 @@ CONFIG_INITRAMFS_SOURCE=""
109CONFIG_RD_GZIP=y 104CONFIG_RD_GZIP=y
110# CONFIG_RD_BZIP2 is not set 105# CONFIG_RD_BZIP2 is not set
111# CONFIG_RD_LZMA is not set 106# CONFIG_RD_LZMA is not set
107# CONFIG_RD_LZO is not set
112# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 108# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
113CONFIG_SYSCTL=y 109CONFIG_SYSCTL=y
114CONFIG_ANON_INODES=y 110CONFIG_ANON_INODES=y
@@ -340,7 +336,6 @@ CONFIG_NET=y
340# Networking options 336# Networking options
341# 337#
342CONFIG_PACKET=y 338CONFIG_PACKET=y
343# CONFIG_PACKET_MMAP is not set
344CONFIG_UNIX=y 339CONFIG_UNIX=y
345CONFIG_XFRM=y 340CONFIG_XFRM=y
346CONFIG_XFRM_USER=y 341CONFIG_XFRM_USER=y
@@ -517,6 +512,8 @@ CONFIG_MTD_PHYSMAP_OF=y
517# UBI - Unsorted block images 512# UBI - Unsorted block images
518# 513#
519# CONFIG_MTD_UBI is not set 514# CONFIG_MTD_UBI is not set
515CONFIG_OF_FLATTREE=y
516CONFIG_OF_DYNAMIC=y
520CONFIG_OF_DEVICE=y 517CONFIG_OF_DEVICE=y
521CONFIG_OF_I2C=y 518CONFIG_OF_I2C=y
522CONFIG_OF_MDIO=y 519CONFIG_OF_MDIO=y
@@ -684,6 +681,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
684CONFIG_SERIAL_MPC52xx=y 681CONFIG_SERIAL_MPC52xx=y
685CONFIG_SERIAL_MPC52xx_CONSOLE=y 682CONFIG_SERIAL_MPC52xx_CONSOLE=y
686CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600 683CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600
684# CONFIG_SERIAL_TIMBERDALE is not set
687# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 685# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
688CONFIG_UNIX98_PTYS=y 686CONFIG_UNIX98_PTYS=y
689# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 687# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -714,6 +712,7 @@ CONFIG_I2C_HELPER_AUTO=y
714CONFIG_I2C_MPC=y 712CONFIG_I2C_MPC=y
715# CONFIG_I2C_OCORES is not set 713# CONFIG_I2C_OCORES is not set
716# CONFIG_I2C_SIMTEC is not set 714# CONFIG_I2C_SIMTEC is not set
715# CONFIG_I2C_XILINX is not set
717 716
718# 717#
719# External I2C/SMBus adapter drivers 718# External I2C/SMBus adapter drivers
@@ -754,6 +753,7 @@ CONFIG_WATCHDOG=y
754# Watchdog Device Drivers 753# Watchdog Device Drivers
755# 754#
756# CONFIG_SOFT_WATCHDOG is not set 755# CONFIG_SOFT_WATCHDOG is not set
756# CONFIG_MAX63XX_WATCHDOG is not set
757# CONFIG_MPC5200_WDT is not set 757# CONFIG_MPC5200_WDT is not set
758 758
759# 759#
@@ -771,18 +771,20 @@ CONFIG_SSB_POSSIBLE=y
771# Multifunction device drivers 771# Multifunction device drivers
772# 772#
773# CONFIG_MFD_CORE is not set 773# CONFIG_MFD_CORE is not set
774# CONFIG_MFD_88PM860X is not set
774# CONFIG_MFD_SM501 is not set 775# CONFIG_MFD_SM501 is not set
775# CONFIG_HTC_PASIC3 is not set 776# CONFIG_HTC_PASIC3 is not set
776# CONFIG_TWL4030_CORE is not set 777# CONFIG_TWL4030_CORE is not set
777# CONFIG_MFD_TMIO is not set 778# CONFIG_MFD_TMIO is not set
778# CONFIG_PMIC_DA903X is not set 779# CONFIG_PMIC_DA903X is not set
779# CONFIG_PMIC_ADP5520 is not set 780# CONFIG_PMIC_ADP5520 is not set
781# CONFIG_MFD_MAX8925 is not set
780# CONFIG_MFD_WM8400 is not set 782# CONFIG_MFD_WM8400 is not set
781# CONFIG_MFD_WM831X is not set 783# CONFIG_MFD_WM831X is not set
782# CONFIG_MFD_WM8350_I2C is not set 784# CONFIG_MFD_WM8350_I2C is not set
785# CONFIG_MFD_WM8994 is not set
783# CONFIG_MFD_PCF50633 is not set 786# CONFIG_MFD_PCF50633 is not set
784# CONFIG_AB3100_CORE is not set 787# CONFIG_AB3100_CORE is not set
785# CONFIG_MFD_88PM8607 is not set
786# CONFIG_REGULATOR is not set 788# CONFIG_REGULATOR is not set
787# CONFIG_MEDIA_SUPPORT is not set 789# CONFIG_MEDIA_SUPPORT is not set
788 790
@@ -813,7 +815,6 @@ CONFIG_USB=y
813CONFIG_USB_DEVICEFS=y 815CONFIG_USB_DEVICEFS=y
814# CONFIG_USB_DEVICE_CLASS is not set 816# CONFIG_USB_DEVICE_CLASS is not set
815# CONFIG_USB_DYNAMIC_MINORS is not set 817# CONFIG_USB_DYNAMIC_MINORS is not set
816# CONFIG_USB_SUSPEND is not set
817# CONFIG_USB_OTG is not set 818# CONFIG_USB_OTG is not set
818# CONFIG_USB_OTG_WHITELIST is not set 819# CONFIG_USB_OTG_WHITELIST is not set
819# CONFIG_USB_OTG_BLACKLIST_HUB is not set 820# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -891,7 +892,6 @@ CONFIG_USB_STORAGE=y
891# CONFIG_USB_RIO500 is not set 892# CONFIG_USB_RIO500 is not set
892# CONFIG_USB_LEGOTOWER is not set 893# CONFIG_USB_LEGOTOWER is not set
893# CONFIG_USB_LCD is not set 894# CONFIG_USB_LCD is not set
894# CONFIG_USB_BERRY_CHARGE is not set
895# CONFIG_USB_LED is not set 895# CONFIG_USB_LED is not set
896# CONFIG_USB_CYPRESS_CY7C63 is not set 896# CONFIG_USB_CYPRESS_CY7C63 is not set
897# CONFIG_USB_CYTHERM is not set 897# CONFIG_USB_CYTHERM is not set
@@ -903,7 +903,6 @@ CONFIG_USB_STORAGE=y
903# CONFIG_USB_IOWARRIOR is not set 903# CONFIG_USB_IOWARRIOR is not set
904# CONFIG_USB_TEST is not set 904# CONFIG_USB_TEST is not set
905# CONFIG_USB_ISIGHTFW is not set 905# CONFIG_USB_ISIGHTFW is not set
906# CONFIG_USB_VST is not set
907# CONFIG_USB_GADGET is not set 906# CONFIG_USB_GADGET is not set
908 907
909# 908#
@@ -1009,6 +1008,7 @@ CONFIG_JFFS2_ZLIB=y
1009# CONFIG_JFFS2_LZO is not set 1008# CONFIG_JFFS2_LZO is not set
1010CONFIG_JFFS2_RTIME=y 1009CONFIG_JFFS2_RTIME=y
1011# CONFIG_JFFS2_RUBIN is not set 1010# CONFIG_JFFS2_RUBIN is not set
1011# CONFIG_LOGFS is not set
1012CONFIG_CRAMFS=y 1012CONFIG_CRAMFS=y
1013# CONFIG_SQUASHFS is not set 1013# CONFIG_SQUASHFS is not set
1014# CONFIG_VXFS_FS is not set 1014# CONFIG_VXFS_FS is not set
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig
index 7b3f4d0ed404..90492ff25232 100644
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.33-rc2 3# Linux kernel version: 2.6.34-rc1
4# Wed Dec 30 14:45:09 2009 4# Wed Mar 10 14:34:24 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -95,11 +95,6 @@ CONFIG_RCU_FANOUT=32
95# CONFIG_TREE_RCU_TRACE is not set 95# CONFIG_TREE_RCU_TRACE is not set
96# CONFIG_IKCONFIG is not set 96# CONFIG_IKCONFIG is not set
97CONFIG_LOG_BUF_SHIFT=14 97CONFIG_LOG_BUF_SHIFT=14
98CONFIG_GROUP_SCHED=y
99# CONFIG_FAIR_GROUP_SCHED is not set
100# CONFIG_RT_GROUP_SCHED is not set
101CONFIG_USER_SCHED=y
102# CONFIG_CGROUP_SCHED is not set
103# CONFIG_CGROUPS is not set 98# CONFIG_CGROUPS is not set
104CONFIG_SYSFS_DEPRECATED=y 99CONFIG_SYSFS_DEPRECATED=y
105CONFIG_SYSFS_DEPRECATED_V2=y 100CONFIG_SYSFS_DEPRECATED_V2=y
@@ -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
@@ -317,6 +313,7 @@ CONFIG_SUSPEND=y
317CONFIG_SUSPEND_FREEZER=y 313CONFIG_SUSPEND_FREEZER=y
318# CONFIG_HIBERNATION is not set 314# CONFIG_HIBERNATION is not set
319# CONFIG_PM_RUNTIME is not set 315# CONFIG_PM_RUNTIME is not set
316CONFIG_PM_OPS=y
320CONFIG_SECCOMP=y 317CONFIG_SECCOMP=y
321CONFIG_ISA_DMA_API=y 318CONFIG_ISA_DMA_API=y
322 319
@@ -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
336CONFIG_PCI_LEGACY=y
337# CONFIG_PCI_DEBUG is not set 333# CONFIG_PCI_DEBUG 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
@@ -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
@@ -457,6 +452,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
457# CONFIG_SYS_HYPERVISOR is not set 452# CONFIG_SYS_HYPERVISOR is not set
458# CONFIG_CONNECTOR is not set 453# CONFIG_CONNECTOR is not set
459# CONFIG_MTD is not set 454# CONFIG_MTD is not set
455CONFIG_OF_FLATTREE=y
456CONFIG_OF_DYNAMIC=y
460CONFIG_OF_DEVICE=y 457CONFIG_OF_DEVICE=y
461CONFIG_OF_I2C=y 458CONFIG_OF_I2C=y
462CONFIG_OF_MDIO=y 459CONFIG_OF_MDIO=y
@@ -631,6 +628,7 @@ CONFIG_ATA_SFF=y
631# CONFIG_PATA_IT821X is not set 628# CONFIG_PATA_IT821X is not set
632# CONFIG_PATA_IT8213 is not set 629# CONFIG_PATA_IT8213 is not set
633# CONFIG_PATA_JMICRON is not set 630# CONFIG_PATA_JMICRON is not set
631# CONFIG_PATA_LEGACY is not set
634# CONFIG_PATA_TRIFLEX is not set 632# CONFIG_PATA_TRIFLEX is not set
635# CONFIG_PATA_MARVELL is not set 633# CONFIG_PATA_MARVELL is not set
636CONFIG_PATA_MPC52xx=y 634CONFIG_PATA_MPC52xx=y
@@ -668,7 +666,7 @@ CONFIG_PATA_MPC52xx=y
668# 666#
669 667
670# 668#
671# See the help texts for more information. 669# The newer stack is recommended.
672# 670#
673# CONFIG_FIREWIRE is not set 671# CONFIG_FIREWIRE is not set
674# CONFIG_IEEE1394 is not set 672# CONFIG_IEEE1394 is not set
@@ -768,6 +766,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
768# CONFIG_MLX4_CORE is not set 766# CONFIG_MLX4_CORE is not set
769# CONFIG_TEHUTI is not set 767# CONFIG_TEHUTI is not set
770# CONFIG_BNX2X is not set 768# CONFIG_BNX2X is not set
769# CONFIG_QLCNIC is not set
771# CONFIG_QLGE is not set 770# CONFIG_QLGE is not set
772# CONFIG_SFC is not set 771# CONFIG_SFC is not set
773# CONFIG_BE2NET is not set 772# CONFIG_BE2NET is not set
@@ -828,6 +827,7 @@ CONFIG_SERIAL_MPC52xx=y
828CONFIG_SERIAL_MPC52xx_CONSOLE=y 827CONFIG_SERIAL_MPC52xx_CONSOLE=y
829CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 828CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
830# CONFIG_SERIAL_JSM is not set 829# CONFIG_SERIAL_JSM is not set
830# CONFIG_SERIAL_TIMBERDALE is not set
831# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 831# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
832CONFIG_UNIX98_PTYS=y 832CONFIG_UNIX98_PTYS=y
833# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 833# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -879,6 +879,7 @@ CONFIG_I2C_HELPER_AUTO=y
879CONFIG_I2C_MPC=y 879CONFIG_I2C_MPC=y
880# CONFIG_I2C_OCORES is not set 880# CONFIG_I2C_OCORES is not set
881# CONFIG_I2C_SIMTEC is not set 881# CONFIG_I2C_SIMTEC is not set
882# CONFIG_I2C_XILINX is not set
882 883
883# 884#
884# External I2C/SMBus adapter drivers 885# External I2C/SMBus adapter drivers
@@ -924,18 +925,21 @@ CONFIG_SSB_POSSIBLE=y
924# Multifunction device drivers 925# Multifunction device drivers
925# 926#
926# CONFIG_MFD_CORE is not set 927# CONFIG_MFD_CORE is not set
928# CONFIG_MFD_88PM860X is not set
927# CONFIG_MFD_SM501 is not set 929# CONFIG_MFD_SM501 is not set
928# CONFIG_HTC_PASIC3 is not set 930# CONFIG_HTC_PASIC3 is not set
929# CONFIG_TWL4030_CORE is not set 931# CONFIG_TWL4030_CORE is not set
930# CONFIG_MFD_TMIO is not set 932# CONFIG_MFD_TMIO is not set
931# CONFIG_PMIC_DA903X is not set 933# CONFIG_PMIC_DA903X is not set
932# CONFIG_PMIC_ADP5520 is not set 934# CONFIG_PMIC_ADP5520 is not set
935# CONFIG_MFD_MAX8925 is not set
933# CONFIG_MFD_WM8400 is not set 936# CONFIG_MFD_WM8400 is not set
934# CONFIG_MFD_WM831X is not set 937# CONFIG_MFD_WM831X is not set
935# CONFIG_MFD_WM8350_I2C is not set 938# CONFIG_MFD_WM8350_I2C is not set
939# CONFIG_MFD_WM8994 is not set
936# CONFIG_MFD_PCF50633 is not set 940# CONFIG_MFD_PCF50633 is not set
937# CONFIG_AB3100_CORE is not set 941# CONFIG_AB3100_CORE is not set
938# CONFIG_MFD_88PM8607 is not set 942# CONFIG_LPC_SCH is not set
939# CONFIG_REGULATOR is not set 943# CONFIG_REGULATOR is not set
940# CONFIG_MEDIA_SUPPORT is not set 944# CONFIG_MEDIA_SUPPORT is not set
941 945
@@ -944,6 +948,7 @@ CONFIG_SSB_POSSIBLE=y
944# 948#
945# CONFIG_AGP is not set 949# CONFIG_AGP is not set
946CONFIG_VGA_ARB=y 950CONFIG_VGA_ARB=y
951CONFIG_VGA_ARB_MAX_GPUS=16
947# CONFIG_DRM is not set 952# CONFIG_DRM is not set
948# CONFIG_VGASTATE is not set 953# CONFIG_VGASTATE is not set
949CONFIG_VIDEO_OUTPUT_CONTROL=m 954CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1062,6 +1067,7 @@ CONFIG_MISC_FILESYSTEMS=y
1062# CONFIG_BEFS_FS is not set 1067# CONFIG_BEFS_FS is not set
1063# CONFIG_BFS_FS is not set 1068# CONFIG_BFS_FS is not set
1064# CONFIG_EFS_FS is not set 1069# CONFIG_EFS_FS is not set
1070# CONFIG_LOGFS is not set
1065# CONFIG_CRAMFS is not set 1071# CONFIG_CRAMFS is not set
1066# CONFIG_SQUASHFS is not set 1072# CONFIG_SQUASHFS is not set
1067# CONFIG_VXFS_FS is not set 1073# CONFIG_VXFS_FS is not set
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index eaae2d469aa0..dffc8cac825f 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.33-rc2 3# Linux kernel version: 2.6.34-rc1
4# Wed Dec 30 14:45:08 2009 4# Wed Mar 10 14:34:23 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -94,11 +94,6 @@ CONFIG_RCU_FANOUT=32
94# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
96CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
97CONFIG_GROUP_SCHED=y
98CONFIG_FAIR_GROUP_SCHED=y
99# CONFIG_RT_GROUP_SCHED is not set
100CONFIG_USER_SCHED=y
101# CONFIG_CGROUP_SCHED is not set
102# CONFIG_CGROUPS is not set 97# CONFIG_CGROUPS is not set
103CONFIG_SYSFS_DEPRECATED=y 98CONFIG_SYSFS_DEPRECATED=y
104CONFIG_SYSFS_DEPRECATED_V2=y 99CONFIG_SYSFS_DEPRECATED_V2=y
@@ -109,6 +104,7 @@ CONFIG_INITRAMFS_SOURCE=""
109CONFIG_RD_GZIP=y 104CONFIG_RD_GZIP=y
110# CONFIG_RD_BZIP2 is not set 105# CONFIG_RD_BZIP2 is not set
111# CONFIG_RD_LZMA is not set 106# CONFIG_RD_LZMA is not set
107# CONFIG_RD_LZO is not set
112# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 108# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
113CONFIG_SYSCTL=y 109CONFIG_SYSCTL=y
114CONFIG_ANON_INODES=y 110CONFIG_ANON_INODES=y
@@ -341,7 +337,6 @@ CONFIG_NET=y
341# Networking options 337# Networking options
342# 338#
343CONFIG_PACKET=y 339CONFIG_PACKET=y
344# CONFIG_PACKET_MMAP is not set
345CONFIG_UNIX=y 340CONFIG_UNIX=y
346CONFIG_XFRM=y 341CONFIG_XFRM=y
347CONFIG_XFRM_USER=y 342CONFIG_XFRM_USER=y
@@ -518,6 +513,8 @@ CONFIG_MTD_ROM=y
518# UBI - Unsorted block images 513# UBI - Unsorted block images
519# 514#
520# CONFIG_MTD_UBI is not set 515# CONFIG_MTD_UBI is not set
516CONFIG_OF_FLATTREE=y
517CONFIG_OF_DYNAMIC=y
521CONFIG_OF_DEVICE=y 518CONFIG_OF_DEVICE=y
522CONFIG_OF_I2C=y 519CONFIG_OF_I2C=y
523CONFIG_OF_MDIO=y 520CONFIG_OF_MDIO=y
@@ -699,6 +696,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
699CONFIG_SERIAL_MPC52xx=y 696CONFIG_SERIAL_MPC52xx=y
700CONFIG_SERIAL_MPC52xx_CONSOLE=y 697CONFIG_SERIAL_MPC52xx_CONSOLE=y
701CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 698CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
699# CONFIG_SERIAL_TIMBERDALE is not set
702# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 700# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
703CONFIG_UNIX98_PTYS=y 701CONFIG_UNIX98_PTYS=y
704# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 702# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -728,6 +726,7 @@ CONFIG_I2C_HELPER_AUTO=y
728CONFIG_I2C_MPC=y 726CONFIG_I2C_MPC=y
729# CONFIG_I2C_OCORES is not set 727# CONFIG_I2C_OCORES is not set
730# CONFIG_I2C_SIMTEC is not set 728# CONFIG_I2C_SIMTEC is not set
729# CONFIG_I2C_XILINX is not set
731 730
732# 731#
733# External I2C/SMBus adapter drivers 732# External I2C/SMBus adapter drivers
@@ -773,10 +772,11 @@ CONFIG_HWMON=y
773# CONFIG_SENSORS_ADM1029 is not set 772# CONFIG_SENSORS_ADM1029 is not set
774# CONFIG_SENSORS_ADM1031 is not set 773# CONFIG_SENSORS_ADM1031 is not set
775# CONFIG_SENSORS_ADM9240 is not set 774# CONFIG_SENSORS_ADM9240 is not set
775# CONFIG_SENSORS_ADT7411 is not set
776# CONFIG_SENSORS_ADT7462 is not set 776# CONFIG_SENSORS_ADT7462 is not set
777# CONFIG_SENSORS_ADT7470 is not set 777# CONFIG_SENSORS_ADT7470 is not set
778# CONFIG_SENSORS_ADT7473 is not set
779# CONFIG_SENSORS_ADT7475 is not set 778# CONFIG_SENSORS_ADT7475 is not set
779# CONFIG_SENSORS_ASC7621 is not set
780# CONFIG_SENSORS_ATXP1 is not set 780# CONFIG_SENSORS_ATXP1 is not set
781# CONFIG_SENSORS_DS1621 is not set 781# CONFIG_SENSORS_DS1621 is not set
782# CONFIG_SENSORS_F71805F is not set 782# CONFIG_SENSORS_F71805F is not set
@@ -811,6 +811,7 @@ CONFIG_HWMON=y
811# CONFIG_SENSORS_SMSC47M192 is not set 811# CONFIG_SENSORS_SMSC47M192 is not set
812# CONFIG_SENSORS_SMSC47B397 is not set 812# CONFIG_SENSORS_SMSC47B397 is not set
813# CONFIG_SENSORS_ADS7828 is not set 813# CONFIG_SENSORS_ADS7828 is not set
814# CONFIG_SENSORS_AMC6821 is not set
814# CONFIG_SENSORS_THMC50 is not set 815# CONFIG_SENSORS_THMC50 is not set
815# CONFIG_SENSORS_TMP401 is not set 816# CONFIG_SENSORS_TMP401 is not set
816# CONFIG_SENSORS_TMP421 is not set 817# CONFIG_SENSORS_TMP421 is not set
@@ -831,6 +832,7 @@ CONFIG_WATCHDOG=y
831# Watchdog Device Drivers 832# Watchdog Device Drivers
832# 833#
833# CONFIG_SOFT_WATCHDOG is not set 834# CONFIG_SOFT_WATCHDOG is not set
835# CONFIG_MAX63XX_WATCHDOG is not set
834# CONFIG_MPC5200_WDT is not set 836# CONFIG_MPC5200_WDT is not set
835CONFIG_SSB_POSSIBLE=y 837CONFIG_SSB_POSSIBLE=y
836 838
@@ -843,18 +845,20 @@ CONFIG_SSB_POSSIBLE=y
843# Multifunction device drivers 845# Multifunction device drivers
844# 846#
845# CONFIG_MFD_CORE is not set 847# CONFIG_MFD_CORE is not set
848# CONFIG_MFD_88PM860X is not set
846# CONFIG_MFD_SM501 is not set 849# CONFIG_MFD_SM501 is not set
847# CONFIG_HTC_PASIC3 is not set 850# CONFIG_HTC_PASIC3 is not set
848# CONFIG_TWL4030_CORE is not set 851# CONFIG_TWL4030_CORE is not set
849# CONFIG_MFD_TMIO is not set 852# CONFIG_MFD_TMIO is not set
850# CONFIG_PMIC_DA903X is not set 853# CONFIG_PMIC_DA903X is not set
851# CONFIG_PMIC_ADP5520 is not set 854# CONFIG_PMIC_ADP5520 is not set
855# CONFIG_MFD_MAX8925 is not set
852# CONFIG_MFD_WM8400 is not set 856# CONFIG_MFD_WM8400 is not set
853# CONFIG_MFD_WM831X is not set 857# CONFIG_MFD_WM831X is not set
854# CONFIG_MFD_WM8350_I2C is not set 858# CONFIG_MFD_WM8350_I2C is not set
859# CONFIG_MFD_WM8994 is not set
855# CONFIG_MFD_PCF50633 is not set 860# CONFIG_MFD_PCF50633 is not set
856# CONFIG_AB3100_CORE is not set 861# CONFIG_AB3100_CORE is not set
857# CONFIG_MFD_88PM8607 is not set
858# CONFIG_REGULATOR is not set 862# CONFIG_REGULATOR is not set
859# CONFIG_MEDIA_SUPPORT is not set 863# CONFIG_MEDIA_SUPPORT is not set
860 864
@@ -1050,6 +1054,7 @@ CONFIG_JFFS2_ZLIB=y
1050# CONFIG_JFFS2_LZO is not set 1054# CONFIG_JFFS2_LZO is not set
1051CONFIG_JFFS2_RTIME=y 1055CONFIG_JFFS2_RTIME=y
1052# CONFIG_JFFS2_RUBIN is not set 1056# CONFIG_JFFS2_RUBIN is not set
1057# CONFIG_LOGFS is not set
1053CONFIG_CRAMFS=y 1058CONFIG_CRAMFS=y
1054# CONFIG_SQUASHFS is not set 1059# CONFIG_SQUASHFS is not set
1055# CONFIG_VXFS_FS is not set 1060# CONFIG_VXFS_FS is not set
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig
index 1742c0200b75..3cb2a522046a 100644
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.33-rc2 3# Linux kernel version: 2.6.34-rc1
4# Wed Dec 30 14:45:10 2009 4# Wed Mar 10 14:34:25 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
97CONFIG_IKCONFIG=y 97CONFIG_IKCONFIG=y
98CONFIG_IKCONFIG_PROC=y 98CONFIG_IKCONFIG_PROC=y
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
106CONFIG_SYSFS_DEPRECATED=y 101CONFIG_SYSFS_DEPRECATED=y
107CONFIG_SYSFS_DEPRECATED_V2=y 102CONFIG_SYSFS_DEPRECATED_V2=y
@@ -326,7 +321,6 @@ CONFIG_PCI_SYSCALL=y
326# CONFIG_PCIEPORTBUS is not set 321# CONFIG_PCIEPORTBUS is not set
327CONFIG_ARCH_SUPPORTS_MSI=y 322CONFIG_ARCH_SUPPORTS_MSI=y
328# CONFIG_PCI_MSI is not set 323# CONFIG_PCI_MSI is not set
329CONFIG_PCI_LEGACY=y
330# CONFIG_PCI_STUB is not set 324# CONFIG_PCI_STUB is not set
331# CONFIG_PCI_IOV is not set 325# CONFIG_PCI_IOV is not set
332# CONFIG_PCCARD is not set 326# CONFIG_PCCARD is not set
@@ -352,7 +346,6 @@ CONFIG_NET=y
352# Networking options 346# Networking options
353# 347#
354CONFIG_PACKET=y 348CONFIG_PACKET=y
355# CONFIG_PACKET_MMAP is not set
356CONFIG_UNIX=y 349CONFIG_UNIX=y
357# CONFIG_NET_KEY is not set 350# CONFIG_NET_KEY is not set
358CONFIG_INET=y 351CONFIG_INET=y
@@ -525,6 +518,8 @@ CONFIG_MTD_PHYSMAP=y
525# UBI - Unsorted block images 518# UBI - Unsorted block images
526# 519#
527# CONFIG_MTD_UBI is not set 520# CONFIG_MTD_UBI is not set
521CONFIG_OF_FLATTREE=y
522CONFIG_OF_DYNAMIC=y
528CONFIG_OF_DEVICE=y 523CONFIG_OF_DEVICE=y
529CONFIG_OF_I2C=y 524CONFIG_OF_I2C=y
530CONFIG_OF_MDIO=y 525CONFIG_OF_MDIO=y
@@ -610,6 +605,7 @@ CONFIG_ATA_SFF=y
610# CONFIG_PATA_IT821X is not set 605# CONFIG_PATA_IT821X is not set
611# CONFIG_PATA_IT8213 is not set 606# CONFIG_PATA_IT8213 is not set
612# CONFIG_PATA_JMICRON is not set 607# CONFIG_PATA_JMICRON is not set
608# CONFIG_PATA_LEGACY is not set
613# CONFIG_PATA_TRIFLEX is not set 609# CONFIG_PATA_TRIFLEX is not set
614# CONFIG_PATA_MARVELL is not set 610# CONFIG_PATA_MARVELL is not set
615CONFIG_PATA_MPC52xx=m 611CONFIG_PATA_MPC52xx=m
@@ -647,7 +643,7 @@ CONFIG_PATA_MPC52xx=m
647# 643#
648 644
649# 645#
650# See the help texts for more information. 646# The newer stack is recommended.
651# 647#
652# CONFIG_FIREWIRE is not set 648# CONFIG_FIREWIRE is not set
653# CONFIG_IEEE1394 is not set 649# CONFIG_IEEE1394 is not set
@@ -775,6 +771,7 @@ CONFIG_SERIAL_MPC52xx=y
775CONFIG_SERIAL_MPC52xx_CONSOLE=y 771CONFIG_SERIAL_MPC52xx_CONSOLE=y
776CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 772CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600
777# CONFIG_SERIAL_JSM is not set 773# CONFIG_SERIAL_JSM is not set
774# CONFIG_SERIAL_TIMBERDALE is not set
778# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 775# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
779CONFIG_UNIX98_PTYS=y 776CONFIG_UNIX98_PTYS=y
780# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 777# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -824,6 +821,7 @@ CONFIG_I2C_HELPER_AUTO=y
824CONFIG_I2C_MPC=y 821CONFIG_I2C_MPC=y
825# CONFIG_I2C_OCORES is not set 822# CONFIG_I2C_OCORES is not set
826# CONFIG_I2C_SIMTEC is not set 823# CONFIG_I2C_SIMTEC is not set
824# CONFIG_I2C_XILINX is not set
827 825
828# 826#
829# External I2C/SMBus adapter drivers 827# External I2C/SMBus adapter drivers
@@ -870,18 +868,21 @@ CONFIG_SSB_POSSIBLE=y
870# Multifunction device drivers 868# Multifunction device drivers
871# 869#
872# CONFIG_MFD_CORE is not set 870# CONFIG_MFD_CORE is not set
871# CONFIG_MFD_88PM860X is not set
873# CONFIG_MFD_SM501 is not set 872# CONFIG_MFD_SM501 is not set
874# CONFIG_HTC_PASIC3 is not set 873# CONFIG_HTC_PASIC3 is not set
875# CONFIG_TWL4030_CORE is not set 874# CONFIG_TWL4030_CORE is not set
876# CONFIG_MFD_TMIO is not set 875# CONFIG_MFD_TMIO is not set
877# CONFIG_PMIC_DA903X is not set 876# CONFIG_PMIC_DA903X is not set
878# CONFIG_PMIC_ADP5520 is not set 877# CONFIG_PMIC_ADP5520 is not set
878# CONFIG_MFD_MAX8925 is not set
879# CONFIG_MFD_WM8400 is not set 879# CONFIG_MFD_WM8400 is not set
880# CONFIG_MFD_WM831X is not set 880# CONFIG_MFD_WM831X is not set
881# CONFIG_MFD_WM8350_I2C is not set 881# CONFIG_MFD_WM8350_I2C is not set
882# CONFIG_MFD_WM8994 is not set
882# CONFIG_MFD_PCF50633 is not set 883# CONFIG_MFD_PCF50633 is not set
883# CONFIG_AB3100_CORE is not set 884# CONFIG_AB3100_CORE is not set
884# CONFIG_MFD_88PM8607 is not set 885# CONFIG_LPC_SCH is not set
885# CONFIG_REGULATOR is not set 886# CONFIG_REGULATOR is not set
886# CONFIG_MEDIA_SUPPORT is not set 887# CONFIG_MEDIA_SUPPORT is not set
887 888
@@ -890,6 +891,7 @@ CONFIG_SSB_POSSIBLE=y
890# 891#
891# CONFIG_AGP is not set 892# CONFIG_AGP is not set
892CONFIG_VGA_ARB=y 893CONFIG_VGA_ARB=y
894CONFIG_VGA_ARB_MAX_GPUS=16
893# CONFIG_DRM is not set 895# CONFIG_DRM is not set
894# CONFIG_VGASTATE is not set 896# CONFIG_VGASTATE is not set
895# CONFIG_VIDEO_OUTPUT_CONTROL is not set 897# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -997,7 +999,6 @@ CONFIG_USB_STORAGE=m
997# CONFIG_USB_RIO500 is not set 999# CONFIG_USB_RIO500 is not set
998# CONFIG_USB_LEGOTOWER is not set 1000# CONFIG_USB_LEGOTOWER is not set
999# CONFIG_USB_LCD is not set 1001# CONFIG_USB_LCD is not set
1000# CONFIG_USB_BERRY_CHARGE is not set
1001# CONFIG_USB_LED is not set 1002# CONFIG_USB_LED is not set
1002# CONFIG_USB_CYPRESS_CY7C63 is not set 1003# CONFIG_USB_CYPRESS_CY7C63 is not set
1003# CONFIG_USB_CYTHERM is not set 1004# CONFIG_USB_CYTHERM is not set
@@ -1009,7 +1010,6 @@ CONFIG_USB_STORAGE=m
1009# CONFIG_USB_IOWARRIOR is not set 1010# CONFIG_USB_IOWARRIOR is not set
1010# CONFIG_USB_TEST is not set 1011# CONFIG_USB_TEST is not set
1011# CONFIG_USB_ISIGHTFW is not set 1012# CONFIG_USB_ISIGHTFW is not set
1012# CONFIG_USB_VST is not set
1013# CONFIG_USB_GADGET is not set 1013# CONFIG_USB_GADGET is not set
1014 1014
1015# 1015#
@@ -1172,6 +1172,7 @@ CONFIG_JFFS2_ZLIB=y
1172# CONFIG_JFFS2_LZO is not set 1172# CONFIG_JFFS2_LZO is not set
1173CONFIG_JFFS2_RTIME=y 1173CONFIG_JFFS2_RTIME=y
1174# CONFIG_JFFS2_RUBIN is not set 1174# CONFIG_JFFS2_RUBIN is not set
1175# CONFIG_LOGFS is not set
1175# CONFIG_CRAMFS is not set 1176# CONFIG_CRAMFS is not set
1176# CONFIG_SQUASHFS is not set 1177# CONFIG_SQUASHFS is not set
1177# CONFIG_VXFS_FS is not set 1178# CONFIG_VXFS_FS is not set
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index 3972438db719..96181c62abfa 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.33-rc2 3# Linux kernel version: 2.6.34-rc1
4# Wed Dec 30 14:45:09 2009 4# Wed Mar 10 14:34:24 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -94,11 +94,6 @@ CONFIG_RCU_FANOUT=32
94# CONFIG_TREE_RCU_TRACE is not set 94# CONFIG_TREE_RCU_TRACE is not set
95# CONFIG_IKCONFIG is not set 95# CONFIG_IKCONFIG is not set
96CONFIG_LOG_BUF_SHIFT=14 96CONFIG_LOG_BUF_SHIFT=14
97CONFIG_GROUP_SCHED=y
98CONFIG_FAIR_GROUP_SCHED=y
99# CONFIG_RT_GROUP_SCHED is not set
100CONFIG_USER_SCHED=y
101# CONFIG_CGROUP_SCHED is not set
102# CONFIG_CGROUPS is not set 97# CONFIG_CGROUPS is not set
103CONFIG_SYSFS_DEPRECATED=y 98CONFIG_SYSFS_DEPRECATED=y
104CONFIG_SYSFS_DEPRECATED_V2=y 99CONFIG_SYSFS_DEPRECATED_V2=y
@@ -109,6 +104,7 @@ CONFIG_INITRAMFS_SOURCE=""
109CONFIG_RD_GZIP=y 104CONFIG_RD_GZIP=y
110# CONFIG_RD_BZIP2 is not set 105# CONFIG_RD_BZIP2 is not set
111# CONFIG_RD_LZMA is not set 106# CONFIG_RD_LZMA is not set
107# CONFIG_RD_LZO is not set
112# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 108# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
113CONFIG_SYSCTL=y 109CONFIG_SYSCTL=y
114CONFIG_ANON_INODES=y 110CONFIG_ANON_INODES=y
@@ -346,7 +342,6 @@ CONFIG_NET=y
346# Networking options 342# Networking options
347# 343#
348CONFIG_PACKET=y 344CONFIG_PACKET=y
349# CONFIG_PACKET_MMAP is not set
350CONFIG_UNIX=y 345CONFIG_UNIX=y
351CONFIG_XFRM=y 346CONFIG_XFRM=y
352CONFIG_XFRM_USER=y 347CONFIG_XFRM_USER=y
@@ -524,6 +519,8 @@ CONFIG_MTD_PHYSMAP_OF=y
524# UBI - Unsorted block images 519# UBI - Unsorted block images
525# 520#
526# CONFIG_MTD_UBI is not set 521# CONFIG_MTD_UBI is not set
522CONFIG_OF_FLATTREE=y
523CONFIG_OF_DYNAMIC=y
527CONFIG_OF_DEVICE=y 524CONFIG_OF_DEVICE=y
528CONFIG_OF_I2C=y 525CONFIG_OF_I2C=y
529CONFIG_OF_MDIO=y 526CONFIG_OF_MDIO=y
@@ -704,6 +701,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
704CONFIG_SERIAL_MPC52xx=y 701CONFIG_SERIAL_MPC52xx=y
705CONFIG_SERIAL_MPC52xx_CONSOLE=y 702CONFIG_SERIAL_MPC52xx_CONSOLE=y
706CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 703CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
704# CONFIG_SERIAL_TIMBERDALE is not set
707# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 705# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
708CONFIG_UNIX98_PTYS=y 706CONFIG_UNIX98_PTYS=y
709# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 707# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -733,6 +731,7 @@ CONFIG_I2C_HELPER_AUTO=y
733CONFIG_I2C_MPC=y 731CONFIG_I2C_MPC=y
734# CONFIG_I2C_OCORES is not set 732# CONFIG_I2C_OCORES is not set
735# CONFIG_I2C_SIMTEC is not set 733# CONFIG_I2C_SIMTEC is not set
734# CONFIG_I2C_XILINX is not set
736 735
737# 736#
738# External I2C/SMBus adapter drivers 737# External I2C/SMBus adapter drivers
@@ -780,10 +779,11 @@ CONFIG_HWMON=y
780# CONFIG_SENSORS_ADM1029 is not set 779# CONFIG_SENSORS_ADM1029 is not set
781# CONFIG_SENSORS_ADM1031 is not set 780# CONFIG_SENSORS_ADM1031 is not set
782# CONFIG_SENSORS_ADM9240 is not set 781# CONFIG_SENSORS_ADM9240 is not set
782# CONFIG_SENSORS_ADT7411 is not set
783# CONFIG_SENSORS_ADT7462 is not set 783# CONFIG_SENSORS_ADT7462 is not set
784# CONFIG_SENSORS_ADT7470 is not set 784# CONFIG_SENSORS_ADT7470 is not set
785# CONFIG_SENSORS_ADT7473 is not set
786# CONFIG_SENSORS_ADT7475 is not set 785# CONFIG_SENSORS_ADT7475 is not set
786# CONFIG_SENSORS_ASC7621 is not set
787# CONFIG_SENSORS_ATXP1 is not set 787# CONFIG_SENSORS_ATXP1 is not set
788# CONFIG_SENSORS_DS1621 is not set 788# CONFIG_SENSORS_DS1621 is not set
789# CONFIG_SENSORS_F71805F is not set 789# CONFIG_SENSORS_F71805F is not set
@@ -818,6 +818,7 @@ CONFIG_HWMON=y
818# CONFIG_SENSORS_SMSC47M192 is not set 818# CONFIG_SENSORS_SMSC47M192 is not set
819# CONFIG_SENSORS_SMSC47B397 is not set 819# CONFIG_SENSORS_SMSC47B397 is not set
820# CONFIG_SENSORS_ADS7828 is not set 820# CONFIG_SENSORS_ADS7828 is not set
821# CONFIG_SENSORS_AMC6821 is not set
821# CONFIG_SENSORS_THMC50 is not set 822# CONFIG_SENSORS_THMC50 is not set
822# CONFIG_SENSORS_TMP401 is not set 823# CONFIG_SENSORS_TMP401 is not set
823# CONFIG_SENSORS_TMP421 is not set 824# CONFIG_SENSORS_TMP421 is not set
@@ -838,6 +839,7 @@ CONFIG_WATCHDOG=y
838# Watchdog Device Drivers 839# Watchdog Device Drivers
839# 840#
840# CONFIG_SOFT_WATCHDOG is not set 841# CONFIG_SOFT_WATCHDOG is not set
842# CONFIG_MAX63XX_WATCHDOG is not set
841# CONFIG_MPC5200_WDT is not set 843# CONFIG_MPC5200_WDT is not set
842 844
843# 845#
@@ -855,18 +857,20 @@ CONFIG_SSB_POSSIBLE=y
855# Multifunction device drivers 857# Multifunction device drivers
856# 858#
857# CONFIG_MFD_CORE is not set 859# CONFIG_MFD_CORE is not set
860# CONFIG_MFD_88PM860X is not set
858# CONFIG_MFD_SM501 is not set 861# CONFIG_MFD_SM501 is not set
859# CONFIG_HTC_PASIC3 is not set 862# CONFIG_HTC_PASIC3 is not set
860# CONFIG_TWL4030_CORE is not set 863# CONFIG_TWL4030_CORE is not set
861# CONFIG_MFD_TMIO is not set 864# CONFIG_MFD_TMIO is not set
862# CONFIG_PMIC_DA903X is not set 865# CONFIG_PMIC_DA903X is not set
863# CONFIG_PMIC_ADP5520 is not set 866# CONFIG_PMIC_ADP5520 is not set
867# CONFIG_MFD_MAX8925 is not set
864# CONFIG_MFD_WM8400 is not set 868# CONFIG_MFD_WM8400 is not set
865# CONFIG_MFD_WM831X is not set 869# CONFIG_MFD_WM831X is not set
866# CONFIG_MFD_WM8350_I2C is not set 870# CONFIG_MFD_WM8350_I2C is not set
871# CONFIG_MFD_WM8994 is not set
867# CONFIG_MFD_PCF50633 is not set 872# CONFIG_MFD_PCF50633 is not set
868# CONFIG_AB3100_CORE is not set 873# CONFIG_AB3100_CORE is not set
869# CONFIG_MFD_88PM8607 is not set
870# CONFIG_REGULATOR is not set 874# CONFIG_REGULATOR is not set
871# CONFIG_MEDIA_SUPPORT is not set 875# CONFIG_MEDIA_SUPPORT is not set
872 876
@@ -897,7 +901,6 @@ CONFIG_USB=y
897CONFIG_USB_DEVICEFS=y 901CONFIG_USB_DEVICEFS=y
898# CONFIG_USB_DEVICE_CLASS is not set 902# CONFIG_USB_DEVICE_CLASS is not set
899# CONFIG_USB_DYNAMIC_MINORS is not set 903# CONFIG_USB_DYNAMIC_MINORS is not set
900# CONFIG_USB_SUSPEND is not set
901# CONFIG_USB_OTG is not set 904# CONFIG_USB_OTG is not set
902# CONFIG_USB_OTG_WHITELIST is not set 905# CONFIG_USB_OTG_WHITELIST is not set
903# CONFIG_USB_OTG_BLACKLIST_HUB is not set 906# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -975,7 +978,6 @@ CONFIG_USB_STORAGE=y
975# CONFIG_USB_RIO500 is not set 978# CONFIG_USB_RIO500 is not set
976# CONFIG_USB_LEGOTOWER is not set 979# CONFIG_USB_LEGOTOWER is not set
977# CONFIG_USB_LCD is not set 980# CONFIG_USB_LCD is not set
978# CONFIG_USB_BERRY_CHARGE is not set
979# CONFIG_USB_LED is not set 981# CONFIG_USB_LED is not set
980# CONFIG_USB_CYPRESS_CY7C63 is not set 982# CONFIG_USB_CYPRESS_CY7C63 is not set
981# CONFIG_USB_CYTHERM is not set 983# CONFIG_USB_CYTHERM is not set
@@ -987,7 +989,6 @@ CONFIG_USB_STORAGE=y
987# CONFIG_USB_IOWARRIOR is not set 989# CONFIG_USB_IOWARRIOR is not set
988# CONFIG_USB_TEST is not set 990# CONFIG_USB_TEST is not set
989# CONFIG_USB_ISIGHTFW is not set 991# CONFIG_USB_ISIGHTFW is not set
990# CONFIG_USB_VST is not set
991# CONFIG_USB_GADGET is not set 992# CONFIG_USB_GADGET is not set
992 993
993# 994#
@@ -1151,6 +1152,7 @@ CONFIG_JFFS2_ZLIB=y
1151# CONFIG_JFFS2_LZO is not set 1152# CONFIG_JFFS2_LZO is not set
1152CONFIG_JFFS2_RTIME=y 1153CONFIG_JFFS2_RTIME=y
1153# CONFIG_JFFS2_RUBIN is not set 1154# CONFIG_JFFS2_RUBIN is not set
1155# CONFIG_LOGFS is not set
1154CONFIG_CRAMFS=y 1156CONFIG_CRAMFS=y
1155# CONFIG_SQUASHFS is not set 1157# CONFIG_SQUASHFS is not set
1156# CONFIG_VXFS_FS is not set 1158# CONFIG_VXFS_FS is not set
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 61cf73d0000f..7012ac0134f0 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.33-rc2 3# Linux kernel version: 2.6.34-rc1
4# Wed Dec 30 15:08:52 2009 4# Wed Mar 10 14:38:54 2010
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -96,30 +96,37 @@ 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
99# CONFIG_GROUP_SCHED is not set
100# CONFIG_CGROUPS is not set 99# CONFIG_CGROUPS is not set
101CONFIG_SYSFS_DEPRECATED=y 100CONFIG_SYSFS_DEPRECATED=y
102CONFIG_SYSFS_DEPRECATED_V2=y 101CONFIG_SYSFS_DEPRECATED_V2=y
103# CONFIG_RELAY is not set 102# CONFIG_RELAY is not set
104# CONFIG_NAMESPACES is not set 103CONFIG_NAMESPACES=y
104# CONFIG_UTS_NS is not set
105# CONFIG_IPC_NS is not set
106# CONFIG_USER_NS is not set
107# CONFIG_PID_NS is not set
108# CONFIG_NET_NS is not set
105CONFIG_BLK_DEV_INITRD=y 109CONFIG_BLK_DEV_INITRD=y
106CONFIG_INITRAMFS_SOURCE="" 110CONFIG_INITRAMFS_SOURCE=""
107CONFIG_RD_GZIP=y 111CONFIG_RD_GZIP=y
108# CONFIG_RD_BZIP2 is not set 112CONFIG_RD_BZIP2=y
109# CONFIG_RD_LZMA is not set 113CONFIG_RD_LZMA=y
114CONFIG_RD_LZO=y
110# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 115# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
111CONFIG_SYSCTL=y 116CONFIG_SYSCTL=y
112CONFIG_ANON_INODES=y 117CONFIG_ANON_INODES=y
113CONFIG_EMBEDDED=y 118# CONFIG_EMBEDDED is not set
114# CONFIG_SYSCTL_SYSCALL is not set 119CONFIG_SYSCTL_SYSCALL=y
115# CONFIG_KALLSYMS is not set 120CONFIG_KALLSYMS=y
121# CONFIG_KALLSYMS_ALL is not set
122# CONFIG_KALLSYMS_EXTRA_PASS is not set
116CONFIG_HOTPLUG=y 123CONFIG_HOTPLUG=y
117CONFIG_PRINTK=y 124CONFIG_PRINTK=y
118CONFIG_BUG=y 125CONFIG_BUG=y
119CONFIG_ELF_CORE=y 126CONFIG_ELF_CORE=y
120CONFIG_BASE_FULL=y 127CONFIG_BASE_FULL=y
121CONFIG_FUTEX=y 128CONFIG_FUTEX=y
122# CONFIG_EPOLL is not set 129CONFIG_EPOLL=y
123CONFIG_SIGNALFD=y 130CONFIG_SIGNALFD=y
124CONFIG_TIMERFD=y 131CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 132CONFIG_EVENTFD=y
@@ -141,6 +148,7 @@ CONFIG_SLUB=y
141# CONFIG_SLOB is not set 148# CONFIG_SLOB is not set
142# CONFIG_PROFILING is not set 149# CONFIG_PROFILING is not set
143CONFIG_HAVE_OPROFILE=y 150CONFIG_HAVE_OPROFILE=y
151# CONFIG_KPROBES is not set
144CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 152CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
145CONFIG_HAVE_IOREMAP_PROT=y 153CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 154CONFIG_HAVE_KPROBES=y
@@ -320,6 +328,7 @@ CONFIG_SUSPEND=y
320CONFIG_SUSPEND_FREEZER=y 328CONFIG_SUSPEND_FREEZER=y
321# CONFIG_HIBERNATION is not set 329# CONFIG_HIBERNATION is not set
322# CONFIG_PM_RUNTIME is not set 330# CONFIG_PM_RUNTIME is not set
331CONFIG_PM_OPS=y
323CONFIG_SECCOMP=y 332CONFIG_SECCOMP=y
324CONFIG_ISA_DMA_API=y 333CONFIG_ISA_DMA_API=y
325 334
@@ -336,7 +345,6 @@ CONFIG_PCI_SYSCALL=y
336# CONFIG_PCIEPORTBUS is not set 345# CONFIG_PCIEPORTBUS is not set
337CONFIG_ARCH_SUPPORTS_MSI=y 346CONFIG_ARCH_SUPPORTS_MSI=y
338# CONFIG_PCI_MSI is not set 347# CONFIG_PCI_MSI is not set
339CONFIG_PCI_LEGACY=y
340# CONFIG_PCI_DEBUG is not set 348# CONFIG_PCI_DEBUG is not set
341# CONFIG_PCI_STUB is not set 349# CONFIG_PCI_STUB is not set
342# CONFIG_PCI_IOV is not set 350# CONFIG_PCI_IOV is not set
@@ -363,7 +371,6 @@ CONFIG_NET=y
363# Networking options 371# Networking options
364# 372#
365CONFIG_PACKET=y 373CONFIG_PACKET=y
366# CONFIG_PACKET_MMAP is not set
367CONFIG_UNIX=y 374CONFIG_UNIX=y
368CONFIG_XFRM=y 375CONFIG_XFRM=y
369CONFIG_XFRM_USER=m 376CONFIG_XFRM_USER=m
@@ -454,7 +461,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
454# CONFIG_DEVTMPFS is not set 461# CONFIG_DEVTMPFS is not set
455CONFIG_STANDALONE=y 462CONFIG_STANDALONE=y
456CONFIG_PREVENT_FIRMWARE_BUILD=y 463CONFIG_PREVENT_FIRMWARE_BUILD=y
457# CONFIG_FW_LOADER is not set 464CONFIG_FW_LOADER=y
465CONFIG_FIRMWARE_IN_KERNEL=y
466CONFIG_EXTRA_FIRMWARE=""
458# CONFIG_DEBUG_DRIVER is not set 467# CONFIG_DEBUG_DRIVER is not set
459# CONFIG_DEBUG_DEVRES is not set 468# CONFIG_DEBUG_DEVRES is not set
460# CONFIG_SYS_HYPERVISOR is not set 469# CONFIG_SYS_HYPERVISOR is not set
@@ -554,6 +563,8 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
554# UBI debugging options 563# UBI debugging options
555# 564#
556# CONFIG_MTD_UBI_DEBUG is not set 565# CONFIG_MTD_UBI_DEBUG is not set
566CONFIG_OF_FLATTREE=y
567CONFIG_OF_DYNAMIC=y
557CONFIG_OF_DEVICE=y 568CONFIG_OF_DEVICE=y
558CONFIG_OF_GPIO=y 569CONFIG_OF_GPIO=y
559CONFIG_OF_I2C=y 570CONFIG_OF_I2C=y
@@ -732,6 +743,7 @@ CONFIG_ATA_SFF=y
732# CONFIG_PATA_IT821X is not set 743# CONFIG_PATA_IT821X is not set
733# CONFIG_PATA_IT8213 is not set 744# CONFIG_PATA_IT8213 is not set
734# CONFIG_PATA_JMICRON is not set 745# CONFIG_PATA_JMICRON is not set
746# CONFIG_PATA_LEGACY is not set
735# CONFIG_PATA_TRIFLEX is not set 747# CONFIG_PATA_TRIFLEX is not set
736# CONFIG_PATA_MARVELL is not set 748# CONFIG_PATA_MARVELL is not set
737CONFIG_PATA_MPC52xx=y 749CONFIG_PATA_MPC52xx=y
@@ -770,7 +782,7 @@ CONFIG_PATA_PLATFORM=y
770# 782#
771 783
772# 784#
773# See the help texts for more information. 785# The newer stack is recommended.
774# 786#
775# CONFIG_FIREWIRE is not set 787# CONFIG_FIREWIRE is not set
776# CONFIG_IEEE1394 is not set 788# CONFIG_IEEE1394 is not set
@@ -929,6 +941,7 @@ CONFIG_SERIAL_MPC52xx=y
929CONFIG_SERIAL_MPC52xx_CONSOLE=y 941CONFIG_SERIAL_MPC52xx_CONSOLE=y
930CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 942CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
931# CONFIG_SERIAL_JSM is not set 943# CONFIG_SERIAL_JSM is not set
944# CONFIG_SERIAL_TIMBERDALE is not set
932# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 945# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
933CONFIG_UNIX98_PTYS=y 946CONFIG_UNIX98_PTYS=y
934# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 947# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -981,6 +994,7 @@ CONFIG_I2C_ALGOBIT=y
981CONFIG_I2C_MPC=y 994CONFIG_I2C_MPC=y
982# CONFIG_I2C_OCORES is not set 995# CONFIG_I2C_OCORES is not set
983# CONFIG_I2C_SIMTEC is not set 996# CONFIG_I2C_SIMTEC is not set
997# CONFIG_I2C_XILINX is not set
984 998
985# 999#
986# External I2C/SMBus adapter drivers 1000# External I2C/SMBus adapter drivers
@@ -1010,9 +1024,9 @@ CONFIG_SPI_MASTER=y
1010# 1024#
1011# SPI Master Controller Drivers 1025# SPI Master Controller Drivers
1012# 1026#
1013# CONFIG_SPI_BITBANG is not set 1027CONFIG_SPI_BITBANG=m
1014# CONFIG_SPI_GPIO is not set 1028CONFIG_SPI_GPIO=m
1015# CONFIG_SPI_MPC52xx is not set 1029CONFIG_SPI_MPC52xx=m
1016CONFIG_SPI_MPC52xx_PSC=m 1030CONFIG_SPI_MPC52xx_PSC=m
1017# CONFIG_SPI_XILINX is not set 1031# CONFIG_SPI_XILINX is not set
1018# CONFIG_SPI_DESIGNWARE is not set 1032# CONFIG_SPI_DESIGNWARE is not set
@@ -1036,14 +1050,18 @@ CONFIG_GPIOLIB=y
1036# 1050#
1037# Memory mapped GPIO expanders: 1051# Memory mapped GPIO expanders:
1038# 1052#
1053# CONFIG_GPIO_IT8761E is not set
1039# CONFIG_GPIO_XILINX is not set 1054# CONFIG_GPIO_XILINX is not set
1055# CONFIG_GPIO_SCH is not set
1040 1056
1041# 1057#
1042# I2C GPIO expanders: 1058# I2C GPIO expanders:
1043# 1059#
1060# CONFIG_GPIO_MAX7300 is not set
1044# CONFIG_GPIO_MAX732X is not set 1061# CONFIG_GPIO_MAX732X is not set
1045# CONFIG_GPIO_PCA953X is not set 1062# CONFIG_GPIO_PCA953X is not set
1046# CONFIG_GPIO_PCF857X is not set 1063# CONFIG_GPIO_PCF857X is not set
1064# CONFIG_GPIO_ADP5588 is not set
1047 1065
1048# 1066#
1049# PCI GPIO expanders: 1067# PCI GPIO expanders:
@@ -1080,10 +1098,11 @@ CONFIG_HWMON=y
1080# CONFIG_SENSORS_ADM1029 is not set 1098# CONFIG_SENSORS_ADM1029 is not set
1081# CONFIG_SENSORS_ADM1031 is not set 1099# CONFIG_SENSORS_ADM1031 is not set
1082# CONFIG_SENSORS_ADM9240 is not set 1100# CONFIG_SENSORS_ADM9240 is not set
1101# CONFIG_SENSORS_ADT7411 is not set
1083# CONFIG_SENSORS_ADT7462 is not set 1102# CONFIG_SENSORS_ADT7462 is not set
1084# CONFIG_SENSORS_ADT7470 is not set 1103# CONFIG_SENSORS_ADT7470 is not set
1085# CONFIG_SENSORS_ADT7473 is not set
1086# CONFIG_SENSORS_ADT7475 is not set 1104# CONFIG_SENSORS_ADT7475 is not set
1105# CONFIG_SENSORS_ASC7621 is not set
1087# CONFIG_SENSORS_ATXP1 is not set 1106# CONFIG_SENSORS_ATXP1 is not set
1088# CONFIG_SENSORS_DS1621 is not set 1107# CONFIG_SENSORS_DS1621 is not set
1089# CONFIG_SENSORS_I5K_AMB is not set 1108# CONFIG_SENSORS_I5K_AMB is not set
@@ -1123,6 +1142,7 @@ CONFIG_HWMON=y
1123# CONFIG_SENSORS_SMSC47M192 is not set 1142# CONFIG_SENSORS_SMSC47M192 is not set
1124# CONFIG_SENSORS_SMSC47B397 is not set 1143# CONFIG_SENSORS_SMSC47B397 is not set
1125# CONFIG_SENSORS_ADS7828 is not set 1144# CONFIG_SENSORS_ADS7828 is not set
1145# CONFIG_SENSORS_AMC6821 is not set
1126# CONFIG_SENSORS_THMC50 is not set 1146# CONFIG_SENSORS_THMC50 is not set
1127# CONFIG_SENSORS_TMP401 is not set 1147# CONFIG_SENSORS_TMP401 is not set
1128# CONFIG_SENSORS_TMP421 is not set 1148# CONFIG_SENSORS_TMP421 is not set
@@ -1147,6 +1167,7 @@ CONFIG_WATCHDOG=y
1147# Watchdog Device Drivers 1167# Watchdog Device Drivers
1148# 1168#
1149# CONFIG_SOFT_WATCHDOG is not set 1169# CONFIG_SOFT_WATCHDOG is not set
1170# CONFIG_MAX63XX_WATCHDOG is not set
1150# CONFIG_ALIM7101_WDT is not set 1171# CONFIG_ALIM7101_WDT is not set
1151# CONFIG_MPC5200_WDT is not set 1172# CONFIG_MPC5200_WDT is not set
1152# CONFIG_WATCHDOG_RTAS is not set 1173# CONFIG_WATCHDOG_RTAS is not set
@@ -1172,22 +1193,27 @@ CONFIG_SSB_POSSIBLE=y
1172# Multifunction device drivers 1193# Multifunction device drivers
1173# 1194#
1174# CONFIG_MFD_CORE is not set 1195# CONFIG_MFD_CORE is not set
1196# CONFIG_MFD_88PM860X is not set
1175# CONFIG_MFD_SM501 is not set 1197# CONFIG_MFD_SM501 is not set
1176# CONFIG_HTC_PASIC3 is not set 1198# CONFIG_HTC_PASIC3 is not set
1199# CONFIG_HTC_I2CPLD is not set
1177# CONFIG_TPS65010 is not set 1200# CONFIG_TPS65010 is not set
1178# CONFIG_TWL4030_CORE is not set 1201# CONFIG_TWL4030_CORE is not set
1179# CONFIG_MFD_TMIO is not set 1202# CONFIG_MFD_TMIO is not set
1180# CONFIG_PMIC_DA903X is not set 1203# CONFIG_PMIC_DA903X is not set
1181# CONFIG_PMIC_ADP5520 is not set 1204# CONFIG_PMIC_ADP5520 is not set
1205# CONFIG_MFD_MAX8925 is not set
1182# CONFIG_MFD_WM8400 is not set 1206# CONFIG_MFD_WM8400 is not set
1183# CONFIG_MFD_WM831X is not set 1207# CONFIG_MFD_WM831X is not set
1184# CONFIG_MFD_WM8350_I2C is not set 1208# CONFIG_MFD_WM8350_I2C is not set
1209# CONFIG_MFD_WM8994 is not set
1185# CONFIG_MFD_PCF50633 is not set 1210# CONFIG_MFD_PCF50633 is not set
1186# CONFIG_MFD_MC13783 is not set 1211# CONFIG_MFD_MC13783 is not set
1187# CONFIG_AB3100_CORE is not set 1212# CONFIG_AB3100_CORE is not set
1188# CONFIG_EZX_PCAP is not set 1213# CONFIG_EZX_PCAP is not set
1189# CONFIG_MFD_88PM8607 is not set
1190# CONFIG_AB4500_CORE is not set 1214# CONFIG_AB4500_CORE is not set
1215# CONFIG_MFD_TIMBERDALE is not set
1216# CONFIG_LPC_SCH is not set
1191# CONFIG_REGULATOR is not set 1217# CONFIG_REGULATOR is not set
1192# CONFIG_MEDIA_SUPPORT is not set 1218# CONFIG_MEDIA_SUPPORT is not set
1193 1219
@@ -1196,6 +1222,7 @@ CONFIG_SSB_POSSIBLE=y
1196# 1222#
1197# CONFIG_AGP is not set 1223# CONFIG_AGP is not set
1198CONFIG_VGA_ARB=y 1224CONFIG_VGA_ARB=y
1225CONFIG_VGA_ARB_MAX_GPUS=16
1199CONFIG_DRM=y 1226CONFIG_DRM=y
1200# CONFIG_DRM_TDFX is not set 1227# CONFIG_DRM_TDFX is not set
1201# CONFIG_DRM_R128 is not set 1228# CONFIG_DRM_R128 is not set
@@ -1309,32 +1336,46 @@ CONFIG_USB_HID=y
1309# 1336#
1310# Special HID drivers 1337# Special HID drivers
1311# 1338#
1339# CONFIG_HID_3M_PCT is not set
1312CONFIG_HID_A4TECH=y 1340CONFIG_HID_A4TECH=y
1313# CONFIG_HID_APPLE is not set 1341CONFIG_HID_APPLE=y
1314CONFIG_HID_BELKIN=y 1342CONFIG_HID_BELKIN=y
1315CONFIG_HID_CHERRY=y 1343CONFIG_HID_CHERRY=y
1316# CONFIG_HID_CHICONY is not set 1344CONFIG_HID_CHICONY=y
1317CONFIG_HID_CYPRESS=y 1345CONFIG_HID_CYPRESS=y
1318# CONFIG_HID_DRAGONRISE is not set 1346CONFIG_HID_DRAGONRISE=y
1347# CONFIG_DRAGONRISE_FF is not set
1319CONFIG_HID_EZKEY=y 1348CONFIG_HID_EZKEY=y
1320# CONFIG_HID_KYE is not set 1349CONFIG_HID_KYE=y
1321# CONFIG_HID_GYRATION is not set 1350CONFIG_HID_GYRATION=y
1322# CONFIG_HID_TWINHAN is not set 1351CONFIG_HID_TWINHAN=y
1323# CONFIG_HID_KENSINGTON is not set 1352CONFIG_HID_KENSINGTON=y
1324# CONFIG_HID_LOGITECH is not set 1353CONFIG_HID_LOGITECH=y
1325# CONFIG_HID_MICROSOFT is not set 1354# CONFIG_LOGITECH_FF is not set
1326# CONFIG_HID_MONTEREY is not set 1355# CONFIG_LOGIRUMBLEPAD2_FF is not set
1356# CONFIG_LOGIG940_FF is not set
1357CONFIG_HID_MICROSOFT=y
1358# CONFIG_HID_MOSART is not set
1359CONFIG_HID_MONTEREY=y
1327# CONFIG_HID_NTRIG is not set 1360# CONFIG_HID_NTRIG is not set
1328# CONFIG_HID_PANTHERLORD is not set 1361CONFIG_HID_ORTEK=y
1329# CONFIG_HID_PETALYNX is not set 1362CONFIG_HID_PANTHERLORD=y
1330# CONFIG_HID_SAMSUNG is not set 1363# CONFIG_PANTHERLORD_FF is not set
1331# CONFIG_HID_SONY is not set 1364CONFIG_HID_PETALYNX=y
1332# CONFIG_HID_SUNPLUS is not set 1365# CONFIG_HID_QUANTA is not set
1333# CONFIG_HID_GREENASIA is not set 1366CONFIG_HID_SAMSUNG=y
1334# CONFIG_HID_SMARTJOYPLUS is not set 1367CONFIG_HID_SONY=y
1335# CONFIG_HID_TOPSEED is not set 1368# CONFIG_HID_STANTUM is not set
1336# CONFIG_HID_THRUSTMASTER is not set 1369CONFIG_HID_SUNPLUS=y
1337# CONFIG_HID_ZEROPLUS is not set 1370CONFIG_HID_GREENASIA=y
1371# CONFIG_GREENASIA_FF is not set
1372CONFIG_HID_SMARTJOYPLUS=y
1373# CONFIG_SMARTJOYPLUS_FF is not set
1374CONFIG_HID_TOPSEED=y
1375CONFIG_HID_THRUSTMASTER=y
1376# CONFIG_THRUSTMASTER_FF is not set
1377CONFIG_HID_ZEROPLUS=y
1378# CONFIG_ZEROPLUS_FF is not set
1338CONFIG_USB_SUPPORT=y 1379CONFIG_USB_SUPPORT=y
1339CONFIG_USB_ARCH_HAS_HCD=y 1380CONFIG_USB_ARCH_HAS_HCD=y
1340CONFIG_USB_ARCH_HAS_OHCI=y 1381CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1349,10 +1390,7 @@ CONFIG_USB=y
1349CONFIG_USB_DEVICEFS=y 1390CONFIG_USB_DEVICEFS=y
1350# CONFIG_USB_DEVICE_CLASS is not set 1391# CONFIG_USB_DEVICE_CLASS is not set
1351# CONFIG_USB_DYNAMIC_MINORS is not set 1392# CONFIG_USB_DYNAMIC_MINORS is not set
1352# CONFIG_USB_SUSPEND is not set
1353# CONFIG_USB_OTG is not set 1393# CONFIG_USB_OTG is not set
1354# CONFIG_USB_OTG_WHITELIST is not set
1355# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1356CONFIG_USB_MON=y 1394CONFIG_USB_MON=y
1357# CONFIG_USB_WUSB is not set 1395# CONFIG_USB_WUSB is not set
1358# CONFIG_USB_WUSB_CBAF is not set 1396# CONFIG_USB_WUSB_CBAF is not set
@@ -1433,7 +1471,6 @@ CONFIG_USB_STORAGE=y
1433# CONFIG_USB_RIO500 is not set 1471# CONFIG_USB_RIO500 is not set
1434# CONFIG_USB_LEGOTOWER is not set 1472# CONFIG_USB_LEGOTOWER is not set
1435# CONFIG_USB_LCD is not set 1473# CONFIG_USB_LCD is not set
1436# CONFIG_USB_BERRY_CHARGE is not set
1437# CONFIG_USB_LED is not set 1474# CONFIG_USB_LED is not set
1438# CONFIG_USB_CYPRESS_CY7C63 is not set 1475# CONFIG_USB_CYPRESS_CY7C63 is not set
1439# CONFIG_USB_CYTHERM is not set 1476# CONFIG_USB_CYTHERM is not set
@@ -1445,7 +1482,6 @@ CONFIG_USB_STORAGE=y
1445# CONFIG_USB_IOWARRIOR is not set 1482# CONFIG_USB_IOWARRIOR is not set
1446# CONFIG_USB_TEST is not set 1483# CONFIG_USB_TEST is not set
1447# CONFIG_USB_ISIGHTFW is not set 1484# CONFIG_USB_ISIGHTFW is not set
1448# CONFIG_USB_VST is not set
1449# CONFIG_USB_GADGET is not set 1485# CONFIG_USB_GADGET is not set
1450 1486
1451# 1487#
@@ -1636,6 +1672,7 @@ CONFIG_UBIFS_FS=m
1636CONFIG_UBIFS_FS_LZO=y 1672CONFIG_UBIFS_FS_LZO=y
1637CONFIG_UBIFS_FS_ZLIB=y 1673CONFIG_UBIFS_FS_ZLIB=y
1638# CONFIG_UBIFS_FS_DEBUG is not set 1674# CONFIG_UBIFS_FS_DEBUG is not set
1675# CONFIG_LOGFS is not set
1639CONFIG_CRAMFS=y 1676CONFIG_CRAMFS=y
1640# CONFIG_SQUASHFS is not set 1677# CONFIG_SQUASHFS is not set
1641# CONFIG_VXFS_FS is not set 1678# CONFIG_VXFS_FS is not set
@@ -1730,8 +1767,11 @@ CONFIG_CRC32=y
1730CONFIG_ZLIB_INFLATE=y 1767CONFIG_ZLIB_INFLATE=y
1731CONFIG_ZLIB_DEFLATE=y 1768CONFIG_ZLIB_DEFLATE=y
1732CONFIG_LZO_COMPRESS=m 1769CONFIG_LZO_COMPRESS=m
1733CONFIG_LZO_DECOMPRESS=m 1770CONFIG_LZO_DECOMPRESS=y
1734CONFIG_DECOMPRESS_GZIP=y 1771CONFIG_DECOMPRESS_GZIP=y
1772CONFIG_DECOMPRESS_BZIP2=y
1773CONFIG_DECOMPRESS_LZMA=y
1774CONFIG_DECOMPRESS_LZO=y
1735CONFIG_HAS_IOMEM=y 1775CONFIG_HAS_IOMEM=y
1736CONFIG_HAS_IOPORT=y 1776CONFIG_HAS_IOPORT=y
1737CONFIG_HAS_DMA=y 1777CONFIG_HAS_DMA=y
@@ -1776,11 +1816,11 @@ CONFIG_SCHED_DEBUG=y
1776# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1816# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1777# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1817# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1778# CONFIG_DEBUG_KOBJECT is not set 1818# CONFIG_DEBUG_KOBJECT is not set
1779# CONFIG_DEBUG_BUGVERBOSE is not set 1819CONFIG_DEBUG_BUGVERBOSE=y
1780CONFIG_DEBUG_INFO=y 1820CONFIG_DEBUG_INFO=y
1781# CONFIG_DEBUG_VM is not set 1821# CONFIG_DEBUG_VM is not set
1782# CONFIG_DEBUG_WRITECOUNT is not set 1822# CONFIG_DEBUG_WRITECOUNT is not set
1783# CONFIG_DEBUG_MEMORY_INIT is not set 1823CONFIG_DEBUG_MEMORY_INIT=y
1784# CONFIG_DEBUG_LIST is not set 1824# CONFIG_DEBUG_LIST is not set
1785# CONFIG_DEBUG_SG is not set 1825# CONFIG_DEBUG_SG is not set
1786# CONFIG_DEBUG_NOTIFIERS is not set 1826# CONFIG_DEBUG_NOTIFIERS is not set
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 072b948b2e2d..5d7cc88dae6b 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -711,7 +711,11 @@ static int __devinit mpc52xx_gpt_wdt_init(void)
711 return 0; 711 return 0;
712} 712}
713 713
714#define mpc52xx_gpt_wdt_setup(x, y) (0) 714static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt,
715 const u32 *period)
716{
717 return 0;
718}
715 719
716#endif /* CONFIG_MPC5200_WDT */ 720#endif /* CONFIG_MPC5200_WDT */
717 721
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-22 09:25:40 -0400