diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 01:38:50 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 01:38:50 -0500 |
commit | 7dbcd8c55fa9b39fe27383b697b8989697c1e1c5 (patch) | |
tree | c97dd26d9e8883c5ab4057597db2e606937d9c86 /arch/sh/configs/sh7710voipgw_defconfig | |
parent | 5e9daa0f26d69d22ffe8efeaba6932ea6ef01ec4 (diff) |
sh: update defconfigs.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/configs/sh7710voipgw_defconfig')
-rw-r--r-- | arch/sh/configs/sh7710voipgw_defconfig | 66 |
1 files changed, 51 insertions, 15 deletions
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig index 662156ec9211..35a3beeba182 100644 --- a/arch/sh/configs/sh7710voipgw_defconfig +++ b/arch/sh/configs/sh7710voipgw_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.31 | 3 | # Linux kernel version: 2.6.33-rc2 |
4 | # Thu Sep 24 19:11:49 2009 | 4 | # Mon Jan 4 14:43:04 2010 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -29,6 +29,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y | |||
29 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 29 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
30 | CONFIG_ARCH_HAS_DEFAULT_IDLE=y | 30 | CONFIG_ARCH_HAS_DEFAULT_IDLE=y |
31 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y | 31 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y |
32 | CONFIG_DMA_NONCOHERENT=y | ||
32 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 33 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
33 | CONFIG_CONSTRUCTORS=y | 34 | CONFIG_CONSTRUCTORS=y |
34 | 35 | ||
@@ -60,6 +61,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y | |||
60 | # | 61 | # |
61 | CONFIG_TREE_RCU=y | 62 | CONFIG_TREE_RCU=y |
62 | # CONFIG_TREE_PREEMPT_RCU is not set | 63 | # CONFIG_TREE_PREEMPT_RCU is not set |
64 | # CONFIG_TINY_RCU is not set | ||
63 | # CONFIG_RCU_TRACE is not set | 65 | # CONFIG_RCU_TRACE is not set |
64 | CONFIG_RCU_FANOUT=32 | 66 | CONFIG_RCU_FANOUT=32 |
65 | # CONFIG_RCU_FANOUT_EXACT is not set | 67 | # CONFIG_RCU_FANOUT_EXACT is not set |
@@ -98,6 +100,7 @@ CONFIG_EVENTFD=y | |||
98 | # CONFIG_SHMEM is not set | 100 | # CONFIG_SHMEM is not set |
99 | CONFIG_AIO=y | 101 | CONFIG_AIO=y |
100 | CONFIG_HAVE_PERF_EVENTS=y | 102 | CONFIG_HAVE_PERF_EVENTS=y |
103 | CONFIG_PERF_USE_VMALLOC=y | ||
101 | 104 | ||
102 | # | 105 | # |
103 | # Kernel Performance Events And Counters | 106 | # Kernel Performance Events And Counters |
@@ -116,6 +119,7 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
116 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
117 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
118 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
122 | CONFIG_HAVE_DMA_ATTRS=y | ||
119 | CONFIG_HAVE_CLK=y | 123 | CONFIG_HAVE_CLK=y |
120 | CONFIG_HAVE_DMA_API_DEBUG=y | 124 | CONFIG_HAVE_DMA_API_DEBUG=y |
121 | 125 | ||
@@ -142,14 +146,41 @@ CONFIG_LBDAF=y | |||
142 | # IO Schedulers | 146 | # IO Schedulers |
143 | # | 147 | # |
144 | CONFIG_IOSCHED_NOOP=y | 148 | CONFIG_IOSCHED_NOOP=y |
145 | # CONFIG_IOSCHED_AS is not set | ||
146 | CONFIG_IOSCHED_DEADLINE=y | 149 | CONFIG_IOSCHED_DEADLINE=y |
147 | # CONFIG_IOSCHED_CFQ is not set | 150 | # CONFIG_IOSCHED_CFQ is not set |
148 | # CONFIG_DEFAULT_AS is not set | ||
149 | CONFIG_DEFAULT_DEADLINE=y | 151 | CONFIG_DEFAULT_DEADLINE=y |
150 | # CONFIG_DEFAULT_CFQ is not set | 152 | # CONFIG_DEFAULT_CFQ is not set |
151 | # CONFIG_DEFAULT_NOOP is not set | 153 | # CONFIG_DEFAULT_NOOP is not set |
152 | CONFIG_DEFAULT_IOSCHED="deadline" | 154 | CONFIG_DEFAULT_IOSCHED="deadline" |
155 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
156 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
157 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
158 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
159 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
160 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
161 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
162 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
163 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
164 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
165 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
166 | # CONFIG_INLINE_READ_LOCK is not set | ||
167 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
168 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
169 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
170 | CONFIG_INLINE_READ_UNLOCK=y | ||
171 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
172 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
173 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
174 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
175 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
176 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
177 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
178 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
179 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
180 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
181 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
182 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
183 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
153 | # CONFIG_FREEZER is not set | 184 | # CONFIG_FREEZER is not set |
154 | 185 | ||
155 | # | 186 | # |
@@ -225,8 +256,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
225 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 256 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
226 | CONFIG_ZONE_DMA_FLAG=0 | 257 | CONFIG_ZONE_DMA_FLAG=0 |
227 | CONFIG_NR_QUICK=2 | 258 | CONFIG_NR_QUICK=2 |
228 | CONFIG_HAVE_MLOCK=y | ||
229 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
230 | # CONFIG_KSM is not set | 259 | # CONFIG_KSM is not set |
231 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 260 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
232 | 261 | ||
@@ -460,9 +489,6 @@ CONFIG_NET_SCH_FIFO=y | |||
460 | # CONFIG_AF_RXRPC is not set | 489 | # CONFIG_AF_RXRPC is not set |
461 | CONFIG_WIRELESS=y | 490 | CONFIG_WIRELESS=y |
462 | # CONFIG_CFG80211 is not set | 491 | # CONFIG_CFG80211 is not set |
463 | CONFIG_CFG80211_DEFAULT_PS_VALUE=0 | ||
464 | # CONFIG_WIRELESS_OLD_REGULATORY is not set | ||
465 | # CONFIG_WIRELESS_EXT is not set | ||
466 | # CONFIG_LIB80211 is not set | 492 | # CONFIG_LIB80211 is not set |
467 | 493 | ||
468 | # | 494 | # |
@@ -571,6 +597,10 @@ CONFIG_MTD_RAM=y | |||
571 | CONFIG_BLK_DEV=y | 597 | CONFIG_BLK_DEV=y |
572 | # CONFIG_BLK_DEV_COW_COMMON is not set | 598 | # CONFIG_BLK_DEV_COW_COMMON is not set |
573 | # CONFIG_BLK_DEV_LOOP is not set | 599 | # CONFIG_BLK_DEV_LOOP is not set |
600 | |||
601 | # | ||
602 | # DRBD disabled because PROC_FS, INET or CONNECTOR not selected | ||
603 | # | ||
574 | # CONFIG_BLK_DEV_NBD is not set | 604 | # CONFIG_BLK_DEV_NBD is not set |
575 | # CONFIG_BLK_DEV_RAM is not set | 605 | # CONFIG_BLK_DEV_RAM is not set |
576 | # CONFIG_CDROM_PKTCDVD is not set | 606 | # CONFIG_CDROM_PKTCDVD is not set |
@@ -623,11 +653,11 @@ CONFIG_NET_ETHERNET=y | |||
623 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 653 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
624 | # CONFIG_B44 is not set | 654 | # CONFIG_B44 is not set |
625 | # CONFIG_KS8842 is not set | 655 | # CONFIG_KS8842 is not set |
656 | # CONFIG_KS8851_MLL is not set | ||
626 | CONFIG_NETDEV_1000=y | 657 | CONFIG_NETDEV_1000=y |
627 | CONFIG_NETDEV_10000=y | 658 | CONFIG_NETDEV_10000=y |
628 | CONFIG_WLAN=y | 659 | CONFIG_WLAN=y |
629 | # CONFIG_WLAN_PRE80211 is not set | 660 | # CONFIG_HOSTAP is not set |
630 | # CONFIG_WLAN_80211 is not set | ||
631 | 661 | ||
632 | # | 662 | # |
633 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 663 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -647,6 +677,7 @@ CONFIG_PHONE=y | |||
647 | CONFIG_INPUT=y | 677 | CONFIG_INPUT=y |
648 | # CONFIG_INPUT_FF_MEMLESS is not set | 678 | # CONFIG_INPUT_FF_MEMLESS is not set |
649 | # CONFIG_INPUT_POLLDEV is not set | 679 | # CONFIG_INPUT_POLLDEV is not set |
680 | # CONFIG_INPUT_SPARSEKMAP is not set | ||
650 | 681 | ||
651 | # | 682 | # |
652 | # Userland interfaces | 683 | # Userland interfaces |
@@ -725,6 +756,7 @@ CONFIG_SSB_POSSIBLE=y | |||
725 | # | 756 | # |
726 | # CONFIG_MFD_CORE is not set | 757 | # CONFIG_MFD_CORE is not set |
727 | # CONFIG_MFD_SM501 is not set | 758 | # CONFIG_MFD_SM501 is not set |
759 | # CONFIG_MFD_SH_MOBILE_SDHI is not set | ||
728 | # CONFIG_HTC_PASIC3 is not set | 760 | # CONFIG_HTC_PASIC3 is not set |
729 | # CONFIG_MFD_TMIO is not set | 761 | # CONFIG_MFD_TMIO is not set |
730 | # CONFIG_REGULATOR is not set | 762 | # CONFIG_REGULATOR is not set |
@@ -792,6 +824,7 @@ CONFIG_RTC_LIB=y | |||
792 | # CONFIG_EXT2_FS is not set | 824 | # CONFIG_EXT2_FS is not set |
793 | # CONFIG_EXT3_FS is not set | 825 | # CONFIG_EXT3_FS is not set |
794 | # CONFIG_EXT4_FS is not set | 826 | # CONFIG_EXT4_FS is not set |
827 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
795 | # CONFIG_REISERFS_FS is not set | 828 | # CONFIG_REISERFS_FS is not set |
796 | # CONFIG_JFS_FS is not set | 829 | # CONFIG_JFS_FS is not set |
797 | # CONFIG_FS_POSIX_ACL is not set | 830 | # CONFIG_FS_POSIX_ACL is not set |
@@ -836,7 +869,6 @@ CONFIG_PROC_FS=y | |||
836 | CONFIG_PROC_SYSCTL=y | 869 | CONFIG_PROC_SYSCTL=y |
837 | CONFIG_PROC_PAGE_MONITOR=y | 870 | CONFIG_PROC_PAGE_MONITOR=y |
838 | CONFIG_SYSFS=y | 871 | CONFIG_SYSFS=y |
839 | # CONFIG_HUGETLBFS is not set | ||
840 | # CONFIG_HUGETLB_PAGE is not set | 872 | # CONFIG_HUGETLB_PAGE is not set |
841 | # CONFIG_CONFIGFS_FS is not set | 873 | # CONFIG_CONFIGFS_FS is not set |
842 | CONFIG_MISC_FILESYSTEMS=y | 874 | CONFIG_MISC_FILESYSTEMS=y |
@@ -899,10 +931,11 @@ CONFIG_FRAME_WARN=1024 | |||
899 | CONFIG_DEBUG_FS=y | 931 | CONFIG_DEBUG_FS=y |
900 | # CONFIG_HEADERS_CHECK is not set | 932 | # CONFIG_HEADERS_CHECK is not set |
901 | # CONFIG_DEBUG_KERNEL is not set | 933 | # CONFIG_DEBUG_KERNEL is not set |
902 | # CONFIG_DEBUG_BUGVERBOSE is not set | 934 | CONFIG_DEBUG_BUGVERBOSE=y |
903 | # CONFIG_DEBUG_MEMORY_INIT is not set | 935 | # CONFIG_DEBUG_MEMORY_INIT is not set |
904 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 936 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
905 | # CONFIG_LATENCYTOP is not set | 937 | # CONFIG_LATENCYTOP is not set |
938 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
906 | CONFIG_HAVE_FUNCTION_TRACER=y | 939 | CONFIG_HAVE_FUNCTION_TRACER=y |
907 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | 940 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
908 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y | 941 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y |
@@ -916,7 +949,6 @@ CONFIG_TRACING_SUPPORT=y | |||
916 | # CONFIG_SAMPLES is not set | 949 | # CONFIG_SAMPLES is not set |
917 | CONFIG_HAVE_ARCH_KGDB=y | 950 | CONFIG_HAVE_ARCH_KGDB=y |
918 | # CONFIG_SH_STANDARD_BIOS is not set | 951 | # CONFIG_SH_STANDARD_BIOS is not set |
919 | # CONFIG_EARLY_SCIF_CONSOLE is not set | ||
920 | # CONFIG_DWARF_UNWINDER is not set | 952 | # CONFIG_DWARF_UNWINDER is not set |
921 | 953 | ||
922 | # | 954 | # |
@@ -925,7 +957,11 @@ CONFIG_HAVE_ARCH_KGDB=y | |||
925 | # CONFIG_KEYS is not set | 957 | # CONFIG_KEYS is not set |
926 | # CONFIG_SECURITY is not set | 958 | # CONFIG_SECURITY is not set |
927 | # CONFIG_SECURITYFS is not set | 959 | # CONFIG_SECURITYFS is not set |
928 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 960 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
961 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
962 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
963 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
964 | CONFIG_DEFAULT_SECURITY="" | ||
929 | CONFIG_CRYPTO=y | 965 | CONFIG_CRYPTO=y |
930 | 966 | ||
931 | # | 967 | # |