diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-08-26 20:17:51 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-26 20:24:28 -0400 |
commit | b855192c08fcb14adbc5d3a7cab182022d433cca (patch) | |
tree | 3a10cafbfbf98cafacf667eb218c71300b351bfa /arch/powerpc/configs/83xx/sbc834x_defconfig | |
parent | d886c73cd4cf02a71e1650cbcb6176799d78aac1 (diff) | |
parent | 3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7 (diff) |
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/powerpc/configs/83xx/sbc834x_defconfig')
-rw-r--r-- | arch/powerpc/configs/83xx/sbc834x_defconfig | 103 |
1 files changed, 61 insertions, 42 deletions
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index fe08f672cb27..a592b5efdc4d 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_defconfig | |||
@@ -1,26 +1,28 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.30-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:15 2009 | 4 | # Wed Jul 29 23:32:13 2009 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | CONFIG_6xx=y | 11 | CONFIG_PPC_BOOK3S_32=y |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,8 +124,15 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
135 | # CONFIG_STRIP_ASM_SYMS is not set | ||
125 | CONFIG_COMPAT_BRK=y | 136 | CONFIG_COMPAT_BRK=y |
126 | CONFIG_SLAB=y | 137 | CONFIG_SLAB=y |
127 | # CONFIG_SLUB is not set | 138 | # CONFIG_SLUB is not set |
@@ -134,6 +145,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
134 | CONFIG_HAVE_KPROBES=y | 145 | CONFIG_HAVE_KPROBES=y |
135 | CONFIG_HAVE_KRETPROBES=y | 146 | CONFIG_HAVE_KRETPROBES=y |
136 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 147 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
148 | |||
149 | # | ||
150 | # GCOV-based kernel profiling | ||
151 | # | ||
137 | # CONFIG_SLOW_WORK is not set | 152 | # CONFIG_SLOW_WORK is not set |
138 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 153 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
139 | CONFIG_SLABINFO=y | 154 | CONFIG_SLABINFO=y |
@@ -146,7 +161,7 @@ CONFIG_MODULE_UNLOAD=y | |||
146 | # CONFIG_MODVERSIONS is not set | 161 | # CONFIG_MODVERSIONS is not set |
147 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 162 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
148 | CONFIG_BLOCK=y | 163 | CONFIG_BLOCK=y |
149 | # CONFIG_LBD is not set | 164 | CONFIG_LBDAF=y |
150 | # CONFIG_BLK_DEV_BSG is not set | 165 | # CONFIG_BLK_DEV_BSG is not set |
151 | # CONFIG_BLK_DEV_INTEGRITY is not set | 166 | # CONFIG_BLK_DEV_INTEGRITY is not set |
152 | 167 | ||
@@ -188,6 +203,7 @@ CONFIG_PPC_83xx=y | |||
188 | # CONFIG_MPC837x_RDB is not set | 203 | # CONFIG_MPC837x_RDB is not set |
189 | CONFIG_SBC834x=y | 204 | CONFIG_SBC834x=y |
190 | # CONFIG_ASP834x is not set | 205 | # CONFIG_ASP834x is not set |
206 | # CONFIG_KMETER1 is not set | ||
191 | CONFIG_PPC_MPC834x=y | 207 | CONFIG_PPC_MPC834x=y |
192 | # CONFIG_PPC_86xx is not set | 208 | # CONFIG_PPC_86xx is not set |
193 | # CONFIG_EMBEDDED6xx is not set | 209 | # CONFIG_EMBEDDED6xx is not set |
@@ -232,6 +248,7 @@ CONFIG_BINFMT_ELF=y | |||
232 | # CONFIG_HAVE_AOUT is not set | 248 | # CONFIG_HAVE_AOUT is not set |
233 | # CONFIG_BINFMT_MISC is not set | 249 | # CONFIG_BINFMT_MISC is not set |
234 | # CONFIG_IOMMU_HELPER is not set | 250 | # CONFIG_IOMMU_HELPER is not set |
251 | # CONFIG_SWIOTLB is not set | ||
235 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 252 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
236 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 253 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -252,9 +269,9 @@ CONFIG_MIGRATION=y | |||
252 | CONFIG_ZONE_DMA_FLAG=1 | 269 | CONFIG_ZONE_DMA_FLAG=1 |
253 | CONFIG_BOUNCE=y | 270 | CONFIG_BOUNCE=y |
254 | CONFIG_VIRT_TO_BUS=y | 271 | CONFIG_VIRT_TO_BUS=y |
255 | CONFIG_UNEVICTABLE_LRU=y | ||
256 | CONFIG_HAVE_MLOCK=y | 272 | CONFIG_HAVE_MLOCK=y |
257 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 273 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
274 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
258 | CONFIG_PPC_4K_PAGES=y | 275 | CONFIG_PPC_4K_PAGES=y |
259 | # CONFIG_PPC_16K_PAGES is not set | 276 | # CONFIG_PPC_16K_PAGES is not set |
260 | # CONFIG_PPC_64K_PAGES is not set | 277 | # CONFIG_PPC_64K_PAGES is not set |
@@ -363,6 +380,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
363 | # CONFIG_ECONET is not set | 380 | # CONFIG_ECONET is not set |
364 | # CONFIG_WAN_ROUTER is not set | 381 | # CONFIG_WAN_ROUTER is not set |
365 | # CONFIG_PHONET is not set | 382 | # CONFIG_PHONET is not set |
383 | # CONFIG_IEEE802154 is not set | ||
366 | # CONFIG_NET_SCHED is not set | 384 | # CONFIG_NET_SCHED is not set |
367 | # CONFIG_DCB is not set | 385 | # CONFIG_DCB is not set |
368 | 386 | ||
@@ -380,7 +398,11 @@ CONFIG_WIRELESS=y | |||
380 | CONFIG_WIRELESS_OLD_REGULATORY=y | 398 | CONFIG_WIRELESS_OLD_REGULATORY=y |
381 | # CONFIG_WIRELESS_EXT is not set | 399 | # CONFIG_WIRELESS_EXT is not set |
382 | # CONFIG_LIB80211 is not set | 400 | # CONFIG_LIB80211 is not set |
383 | # CONFIG_MAC80211 is not set | 401 | |
402 | # | ||
403 | # CFG80211 needs to be enabled for MAC80211 | ||
404 | # | ||
405 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
384 | # CONFIG_WIMAX is not set | 406 | # CONFIG_WIMAX is not set |
385 | # CONFIG_RFKILL is not set | 407 | # CONFIG_RFKILL is not set |
386 | # CONFIG_NET_9P is not set | 408 | # CONFIG_NET_9P is not set |
@@ -401,6 +423,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
401 | # CONFIG_MTD is not set | 423 | # CONFIG_MTD is not set |
402 | CONFIG_OF_DEVICE=y | 424 | CONFIG_OF_DEVICE=y |
403 | CONFIG_OF_I2C=y | 425 | CONFIG_OF_I2C=y |
426 | CONFIG_OF_MDIO=y | ||
404 | # CONFIG_PARPORT is not set | 427 | # CONFIG_PARPORT is not set |
405 | CONFIG_BLK_DEV=y | 428 | CONFIG_BLK_DEV=y |
406 | # CONFIG_BLK_DEV_FD is not set | 429 | # CONFIG_BLK_DEV_FD is not set |
@@ -435,7 +458,9 @@ CONFIG_MISC_DEVICES=y | |||
435 | # | 458 | # |
436 | # CONFIG_EEPROM_AT24 is not set | 459 | # CONFIG_EEPROM_AT24 is not set |
437 | # CONFIG_EEPROM_LEGACY is not set | 460 | # CONFIG_EEPROM_LEGACY is not set |
461 | # CONFIG_EEPROM_MAX6875 is not set | ||
438 | # CONFIG_EEPROM_93CX6 is not set | 462 | # CONFIG_EEPROM_93CX6 is not set |
463 | # CONFIG_CB710_CORE is not set | ||
439 | CONFIG_HAVE_IDE=y | 464 | CONFIG_HAVE_IDE=y |
440 | # CONFIG_IDE is not set | 465 | # CONFIG_IDE is not set |
441 | 466 | ||
@@ -455,14 +480,17 @@ CONFIG_HAVE_IDE=y | |||
455 | # | 480 | # |
456 | 481 | ||
457 | # | 482 | # |
458 | # Enable only one of the two stacks, unless you know what you are doing | 483 | # You can enable one or both FireWire driver stacks. |
484 | # | ||
485 | |||
486 | # | ||
487 | # See the help texts for more information. | ||
459 | # | 488 | # |
460 | # CONFIG_FIREWIRE is not set | 489 | # CONFIG_FIREWIRE is not set |
461 | # CONFIG_IEEE1394 is not set | 490 | # CONFIG_IEEE1394 is not set |
462 | # CONFIG_I2O is not set | 491 | # CONFIG_I2O is not set |
463 | # CONFIG_MACINTOSH_DRIVERS is not set | 492 | # CONFIG_MACINTOSH_DRIVERS is not set |
464 | CONFIG_NETDEVICES=y | 493 | CONFIG_NETDEVICES=y |
465 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
466 | # CONFIG_DUMMY is not set | 494 | # CONFIG_DUMMY is not set |
467 | # CONFIG_BONDING is not set | 495 | # CONFIG_BONDING is not set |
468 | # CONFIG_MACVLAN is not set | 496 | # CONFIG_MACVLAN is not set |
@@ -509,6 +537,7 @@ CONFIG_MII=y | |||
509 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 537 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
510 | # CONFIG_NET_PCI is not set | 538 | # CONFIG_NET_PCI is not set |
511 | # CONFIG_B44 is not set | 539 | # CONFIG_B44 is not set |
540 | # CONFIG_KS8842 is not set | ||
512 | # CONFIG_ATL2 is not set | 541 | # CONFIG_ATL2 is not set |
513 | CONFIG_NETDEV_1000=y | 542 | CONFIG_NETDEV_1000=y |
514 | # CONFIG_ACENIC is not set | 543 | # CONFIG_ACENIC is not set |
@@ -528,8 +557,10 @@ CONFIG_NETDEV_1000=y | |||
528 | # CONFIG_VIA_VELOCITY is not set | 557 | # CONFIG_VIA_VELOCITY is not set |
529 | # CONFIG_TIGON3 is not set | 558 | # CONFIG_TIGON3 is not set |
530 | # CONFIG_BNX2 is not set | 559 | # CONFIG_BNX2 is not set |
560 | # CONFIG_CNIC is not set | ||
531 | CONFIG_FSL_PQ_MDIO=y | 561 | CONFIG_FSL_PQ_MDIO=y |
532 | CONFIG_GIANFAR=y | 562 | CONFIG_GIANFAR=y |
563 | # CONFIG_MV643XX_ETH is not set | ||
533 | # CONFIG_QLA3XXX is not set | 564 | # CONFIG_QLA3XXX is not set |
534 | # CONFIG_ATL1 is not set | 565 | # CONFIG_ATL1 is not set |
535 | # CONFIG_ATL1E is not set | 566 | # CONFIG_ATL1E is not set |
@@ -688,13 +719,17 @@ CONFIG_I2C_MPC=y | |||
688 | # CONFIG_SENSORS_PCF8574 is not set | 719 | # CONFIG_SENSORS_PCF8574 is not set |
689 | # CONFIG_PCF8575 is not set | 720 | # CONFIG_PCF8575 is not set |
690 | # CONFIG_SENSORS_PCA9539 is not set | 721 | # CONFIG_SENSORS_PCA9539 is not set |
691 | # CONFIG_SENSORS_MAX6875 is not set | ||
692 | # CONFIG_SENSORS_TSL2550 is not set | 722 | # CONFIG_SENSORS_TSL2550 is not set |
693 | # CONFIG_I2C_DEBUG_CORE is not set | 723 | # CONFIG_I2C_DEBUG_CORE is not set |
694 | # CONFIG_I2C_DEBUG_ALGO is not set | 724 | # CONFIG_I2C_DEBUG_ALGO is not set |
695 | # CONFIG_I2C_DEBUG_BUS is not set | 725 | # CONFIG_I2C_DEBUG_BUS is not set |
696 | # CONFIG_I2C_DEBUG_CHIP is not set | 726 | # CONFIG_I2C_DEBUG_CHIP is not set |
697 | # CONFIG_SPI is not set | 727 | # CONFIG_SPI is not set |
728 | |||
729 | # | ||
730 | # PPS support | ||
731 | # | ||
732 | # CONFIG_PPS is not set | ||
698 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 733 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
699 | # CONFIG_GPIOLIB is not set | 734 | # CONFIG_GPIOLIB is not set |
700 | # CONFIG_W1 is not set | 735 | # CONFIG_W1 is not set |
@@ -749,6 +784,7 @@ CONFIG_HWMON=y | |||
749 | # CONFIG_SENSORS_SMSC47B397 is not set | 784 | # CONFIG_SENSORS_SMSC47B397 is not set |
750 | # CONFIG_SENSORS_ADS7828 is not set | 785 | # CONFIG_SENSORS_ADS7828 is not set |
751 | # CONFIG_SENSORS_THMC50 is not set | 786 | # CONFIG_SENSORS_THMC50 is not set |
787 | # CONFIG_SENSORS_TMP401 is not set | ||
752 | # CONFIG_SENSORS_VIA686A is not set | 788 | # CONFIG_SENSORS_VIA686A is not set |
753 | # CONFIG_SENSORS_VT1211 is not set | 789 | # CONFIG_SENSORS_VT1211 is not set |
754 | # CONFIG_SENSORS_VT8231 is not set | 790 | # CONFIG_SENSORS_VT8231 is not set |
@@ -797,23 +833,9 @@ CONFIG_SSB_POSSIBLE=y | |||
797 | # CONFIG_MFD_WM8400 is not set | 833 | # CONFIG_MFD_WM8400 is not set |
798 | # CONFIG_MFD_WM8350_I2C is not set | 834 | # CONFIG_MFD_WM8350_I2C is not set |
799 | # CONFIG_MFD_PCF50633 is not set | 835 | # CONFIG_MFD_PCF50633 is not set |
836 | # CONFIG_AB3100_CORE is not set | ||
800 | # CONFIG_REGULATOR is not set | 837 | # CONFIG_REGULATOR is not set |
801 | 838 | # CONFIG_MEDIA_SUPPORT is not set | |
802 | # | ||
803 | # Multimedia devices | ||
804 | # | ||
805 | |||
806 | # | ||
807 | # Multimedia core support | ||
808 | # | ||
809 | # CONFIG_VIDEO_DEV is not set | ||
810 | # CONFIG_DVB_CORE is not set | ||
811 | # CONFIG_VIDEO_MEDIA is not set | ||
812 | |||
813 | # | ||
814 | # Multimedia drivers | ||
815 | # | ||
816 | # CONFIG_DAB is not set | ||
817 | 839 | ||
818 | # | 840 | # |
819 | # Graphics support | 841 | # Graphics support |
@@ -851,6 +873,10 @@ CONFIG_HID=y | |||
851 | # CONFIG_DMADEVICES is not set | 873 | # CONFIG_DMADEVICES is not set |
852 | # CONFIG_AUXDISPLAY is not set | 874 | # CONFIG_AUXDISPLAY is not set |
853 | # CONFIG_UIO is not set | 875 | # CONFIG_UIO is not set |
876 | |||
877 | # | ||
878 | # TI VLYNQ | ||
879 | # | ||
854 | # CONFIG_STAGING is not set | 880 | # CONFIG_STAGING is not set |
855 | 881 | ||
856 | # | 882 | # |
@@ -862,10 +888,12 @@ CONFIG_HID=y | |||
862 | # CONFIG_REISERFS_FS is not set | 888 | # CONFIG_REISERFS_FS is not set |
863 | # CONFIG_JFS_FS is not set | 889 | # CONFIG_JFS_FS is not set |
864 | # CONFIG_FS_POSIX_ACL is not set | 890 | # CONFIG_FS_POSIX_ACL is not set |
865 | CONFIG_FILE_LOCKING=y | ||
866 | # CONFIG_XFS_FS is not set | 891 | # CONFIG_XFS_FS is not set |
892 | # CONFIG_GFS2_FS is not set | ||
867 | # CONFIG_OCFS2_FS is not set | 893 | # CONFIG_OCFS2_FS is not set |
868 | # CONFIG_BTRFS_FS is not set | 894 | # CONFIG_BTRFS_FS is not set |
895 | CONFIG_FILE_LOCKING=y | ||
896 | CONFIG_FSNOTIFY=y | ||
869 | CONFIG_DNOTIFY=y | 897 | CONFIG_DNOTIFY=y |
870 | CONFIG_INOTIFY=y | 898 | CONFIG_INOTIFY=y |
871 | CONFIG_INOTIFY_USER=y | 899 | CONFIG_INOTIFY_USER=y |
@@ -928,6 +956,7 @@ CONFIG_NFS_FS=y | |||
928 | CONFIG_NFS_V3=y | 956 | CONFIG_NFS_V3=y |
929 | # CONFIG_NFS_V3_ACL is not set | 957 | # CONFIG_NFS_V3_ACL is not set |
930 | CONFIG_NFS_V4=y | 958 | CONFIG_NFS_V4=y |
959 | # CONFIG_NFS_V4_1 is not set | ||
931 | CONFIG_ROOT_NFS=y | 960 | CONFIG_ROOT_NFS=y |
932 | # CONFIG_NFSD is not set | 961 | # CONFIG_NFSD is not set |
933 | CONFIG_LOCKD=y | 962 | CONFIG_LOCKD=y |
@@ -971,6 +1000,7 @@ CONFIG_HAS_IOPORT=y | |||
971 | CONFIG_HAS_DMA=y | 1000 | CONFIG_HAS_DMA=y |
972 | CONFIG_HAVE_LMB=y | 1001 | CONFIG_HAVE_LMB=y |
973 | CONFIG_NLATTR=y | 1002 | CONFIG_NLATTR=y |
1003 | CONFIG_GENERIC_ATOMIC64=y | ||
974 | 1004 | ||
975 | # | 1005 | # |
976 | # Kernel hacking | 1006 | # Kernel hacking |
@@ -994,22 +1024,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
994 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1024 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
995 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1025 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
996 | CONFIG_TRACING_SUPPORT=y | 1026 | CONFIG_TRACING_SUPPORT=y |
997 | 1027 | # CONFIG_FTRACE is not set | |
998 | # | ||
999 | # Tracers | ||
1000 | # | ||
1001 | # CONFIG_FUNCTION_TRACER is not set | ||
1002 | # CONFIG_SCHED_TRACER is not set | ||
1003 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1004 | # CONFIG_EVENT_TRACER is not set | ||
1005 | # CONFIG_BOOT_TRACER is not set | ||
1006 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1007 | # CONFIG_STACK_TRACER is not set | ||
1008 | # CONFIG_KMEMTRACE is not set | ||
1009 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1010 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1011 | # CONFIG_SAMPLES is not set | 1028 | # CONFIG_SAMPLES is not set |
1012 | CONFIG_HAVE_ARCH_KGDB=y | 1029 | CONFIG_HAVE_ARCH_KGDB=y |
1030 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1031 | CONFIG_PPC_WERROR=y | ||
1013 | CONFIG_PRINT_STACK_DEPTH=64 | 1032 | CONFIG_PRINT_STACK_DEPTH=64 |
1014 | # CONFIG_IRQSTACKS is not set | 1033 | # CONFIG_IRQSTACKS is not set |
1015 | # CONFIG_BOOTX_TEXT is not set | 1034 | # CONFIG_BOOTX_TEXT is not set |