diff options
author | Steven Rostedt <srostedt@redhat.com> | 2010-05-14 09:29:52 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 09:29:52 -0400 |
commit | 23e117fa44429cc054cb27d5621d64e4ced91e52 (patch) | |
tree | a4b9d0902b9c6f009b2c297515221c1b9bed3af8 /arch/powerpc/configs/mpc8272_ads_defconfig | |
parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
parent | a93d2f1744206827ccf416e2cdc5018aa503314e (diff) |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4
Diffstat (limited to 'arch/powerpc/configs/mpc8272_ads_defconfig')
-rw-r--r-- | arch/powerpc/configs/mpc8272_ads_defconfig | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 9073778d3575..6875fb89377e 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.33-rc3 | 3 | # Linux kernel version: 2.6.34-rc5 |
4 | # Wed Jan 6 09:24:05 2010 | 4 | # Mon Apr 19 23:16:29 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -96,8 +96,7 @@ CONFIG_IKCONFIG=y | |||
96 | CONFIG_IKCONFIG_PROC=y | 96 | CONFIG_IKCONFIG_PROC=y |
97 | CONFIG_LOG_BUF_SHIFT=14 | 97 | CONFIG_LOG_BUF_SHIFT=14 |
98 | # CONFIG_CGROUPS is not set | 98 | # CONFIG_CGROUPS is not set |
99 | CONFIG_SYSFS_DEPRECATED=y | 99 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
100 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
101 | # CONFIG_RELAY is not set | 100 | # CONFIG_RELAY is not set |
102 | # CONFIG_NAMESPACES is not set | 101 | # CONFIG_NAMESPACES is not set |
103 | # CONFIG_BLK_DEV_INITRD is not set | 102 | # CONFIG_BLK_DEV_INITRD is not set |
@@ -301,6 +300,7 @@ CONFIG_ISA_DMA_API=y | |||
301 | # Bus options | 300 | # Bus options |
302 | # | 301 | # |
303 | CONFIG_ZONE_DMA=y | 302 | CONFIG_ZONE_DMA=y |
303 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
304 | CONFIG_PPC_INDIRECT_PCI=y | 304 | CONFIG_PPC_INDIRECT_PCI=y |
305 | CONFIG_FSL_SOC=y | 305 | CONFIG_FSL_SOC=y |
306 | CONFIG_PPC_PCI_CHOICE=y | 306 | CONFIG_PPC_PCI_CHOICE=y |
@@ -311,7 +311,6 @@ CONFIG_PCI_8260=y | |||
311 | # CONFIG_PCIEPORTBUS is not set | 311 | # CONFIG_PCIEPORTBUS is not set |
312 | CONFIG_ARCH_SUPPORTS_MSI=y | 312 | CONFIG_ARCH_SUPPORTS_MSI=y |
313 | # CONFIG_PCI_MSI is not set | 313 | # CONFIG_PCI_MSI is not set |
314 | # CONFIG_PCI_LEGACY is not set | ||
315 | # CONFIG_PCI_DEBUG is not set | 314 | # CONFIG_PCI_DEBUG is not set |
316 | # CONFIG_PCI_STUB is not set | 315 | # CONFIG_PCI_STUB is not set |
317 | # CONFIG_PCI_IOV is not set | 316 | # CONFIG_PCI_IOV is not set |
@@ -338,7 +337,6 @@ CONFIG_NET=y | |||
338 | # Networking options | 337 | # Networking options |
339 | # | 338 | # |
340 | CONFIG_PACKET=y | 339 | CONFIG_PACKET=y |
341 | # CONFIG_PACKET_MMAP is not set | ||
342 | CONFIG_UNIX=y | 340 | CONFIG_UNIX=y |
343 | CONFIG_XFRM=y | 341 | CONFIG_XFRM=y |
344 | # CONFIG_XFRM_USER is not set | 342 | # CONFIG_XFRM_USER is not set |
@@ -540,6 +538,8 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
540 | # UBI - Unsorted block images | 538 | # UBI - Unsorted block images |
541 | # | 539 | # |
542 | # CONFIG_MTD_UBI is not set | 540 | # CONFIG_MTD_UBI is not set |
541 | CONFIG_OF_FLATTREE=y | ||
542 | CONFIG_OF_DYNAMIC=y | ||
543 | CONFIG_OF_DEVICE=y | 543 | CONFIG_OF_DEVICE=y |
544 | CONFIG_OF_GPIO=y | 544 | CONFIG_OF_GPIO=y |
545 | CONFIG_OF_MDIO=y | 545 | CONFIG_OF_MDIO=y |
@@ -569,6 +569,7 @@ CONFIG_HAVE_IDE=y | |||
569 | # | 569 | # |
570 | # SCSI device support | 570 | # SCSI device support |
571 | # | 571 | # |
572 | CONFIG_SCSI_MOD=y | ||
572 | # CONFIG_RAID_ATTRS is not set | 573 | # CONFIG_RAID_ATTRS is not set |
573 | # CONFIG_SCSI is not set | 574 | # CONFIG_SCSI is not set |
574 | # CONFIG_SCSI_DMA is not set | 575 | # CONFIG_SCSI_DMA is not set |
@@ -674,6 +675,8 @@ CONFIG_NETDEV_10000=y | |||
674 | # CONFIG_CHELSIO_T1 is not set | 675 | # CONFIG_CHELSIO_T1 is not set |
675 | CONFIG_CHELSIO_T3_DEPENDS=y | 676 | CONFIG_CHELSIO_T3_DEPENDS=y |
676 | # CONFIG_CHELSIO_T3 is not set | 677 | # CONFIG_CHELSIO_T3 is not set |
678 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
679 | # CONFIG_CHELSIO_T4 is not set | ||
677 | # CONFIG_ENIC is not set | 680 | # CONFIG_ENIC is not set |
678 | # CONFIG_IXGBE is not set | 681 | # CONFIG_IXGBE is not set |
679 | # CONFIG_IXGB is not set | 682 | # CONFIG_IXGB is not set |
@@ -686,6 +689,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
686 | # CONFIG_MLX4_CORE is not set | 689 | # CONFIG_MLX4_CORE is not set |
687 | # CONFIG_TEHUTI is not set | 690 | # CONFIG_TEHUTI is not set |
688 | # CONFIG_BNX2X is not set | 691 | # CONFIG_BNX2X is not set |
692 | # CONFIG_QLCNIC is not set | ||
689 | # CONFIG_QLGE is not set | 693 | # CONFIG_QLGE is not set |
690 | # CONFIG_SFC is not set | 694 | # CONFIG_SFC is not set |
691 | # CONFIG_BE2NET is not set | 695 | # CONFIG_BE2NET is not set |
@@ -797,6 +801,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
797 | CONFIG_SERIAL_CPM=y | 801 | CONFIG_SERIAL_CPM=y |
798 | CONFIG_SERIAL_CPM_CONSOLE=y | 802 | CONFIG_SERIAL_CPM_CONSOLE=y |
799 | # CONFIG_SERIAL_JSM is not set | 803 | # CONFIG_SERIAL_JSM is not set |
804 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
800 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | 805 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set |
801 | CONFIG_UNIX98_PTYS=y | 806 | CONFIG_UNIX98_PTYS=y |
802 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 807 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
@@ -825,7 +830,9 @@ CONFIG_GPIOLIB=y | |||
825 | # | 830 | # |
826 | # Memory mapped GPIO expanders: | 831 | # Memory mapped GPIO expanders: |
827 | # | 832 | # |
833 | # CONFIG_GPIO_IT8761E is not set | ||
828 | # CONFIG_GPIO_XILINX is not set | 834 | # CONFIG_GPIO_XILINX is not set |
835 | # CONFIG_GPIO_SCH is not set | ||
829 | 836 | ||
830 | # | 837 | # |
831 | # I2C GPIO expanders: | 838 | # I2C GPIO expanders: |
@@ -864,6 +871,8 @@ CONFIG_SSB_POSSIBLE=y | |||
864 | # CONFIG_MFD_SM501 is not set | 871 | # CONFIG_MFD_SM501 is not set |
865 | # CONFIG_HTC_PASIC3 is not set | 872 | # CONFIG_HTC_PASIC3 is not set |
866 | # CONFIG_MFD_TMIO is not set | 873 | # CONFIG_MFD_TMIO is not set |
874 | # CONFIG_MFD_TIMBERDALE is not set | ||
875 | # CONFIG_LPC_SCH is not set | ||
867 | # CONFIG_REGULATOR is not set | 876 | # CONFIG_REGULATOR is not set |
868 | # CONFIG_MEDIA_SUPPORT is not set | 877 | # CONFIG_MEDIA_SUPPORT is not set |
869 | 878 | ||
@@ -872,6 +881,7 @@ CONFIG_SSB_POSSIBLE=y | |||
872 | # | 881 | # |
873 | # CONFIG_AGP is not set | 882 | # CONFIG_AGP is not set |
874 | CONFIG_VGA_ARB=y | 883 | CONFIG_VGA_ARB=y |
884 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
875 | # CONFIG_DRM is not set | 885 | # CONFIG_DRM is not set |
876 | # CONFIG_VGASTATE is not set | 886 | # CONFIG_VGASTATE is not set |
877 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 887 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
@@ -933,6 +943,7 @@ CONFIG_AUTOFS4_FS=y | |||
933 | # | 943 | # |
934 | # Caches | 944 | # Caches |
935 | # | 945 | # |
946 | # CONFIG_FSCACHE is not set | ||
936 | 947 | ||
937 | # | 948 | # |
938 | # CD-ROM/DVD Filesystems | 949 | # CD-ROM/DVD Filesystems |