diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 13:08:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 13:08:33 -0400 |
commit | d3d07d941fd80c173b6d690ded00ee5fb8302e06 (patch) | |
tree | f1a82c956e393df9933c8544bb564ef1735384ee /arch/sh/configs/se7751_defconfig | |
parent | 6cd8e300b49332eb9eeda45816c711c198d31505 (diff) | |
parent | 54ff328b46e58568c4b3350c2fa3223ef862e5a4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (266 commits)
sh: Tie sparseirq in to Kconfig.
sh: Wire up sys_rt_tgsigqueueinfo.
sh: Fix sys_pwritev() syscall table entry for sh32.
sh: Fix sh4a llsc-based cmpxchg()
sh: sh7724: Add JPU support
sh: sh7724: INTC setting update
sh: sh7722 clock framework rewrite
sh: sh7366 clock framework rewrite
sh: sh7343 clock framework rewrite
sh: sh7724 clock framework rewrite V3
sh: sh7723 clock framework rewrite V2
sh: add enable()/disable()/set_rate() to div6 code
sh: add AP325RXA mode pin configuration
sh: add Migo-R mode pin configuration
sh: sh7722 mode pin definitions
sh: sh7724 mode pin comments
sh: sh7723 mode pin V2
sh: rework mode pin code
sh: clock div6 helper code
sh: clock div4 frequency table offset fix
...
Diffstat (limited to 'arch/sh/configs/se7751_defconfig')
-rw-r--r-- | arch/sh/configs/se7751_defconfig | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/arch/sh/configs/se7751_defconfig b/arch/sh/configs/se7751_defconfig index 67fc26b3a7d0..55f3b788e0cb 100644 --- a/arch/sh/configs/se7751_defconfig +++ b/arch/sh/configs/se7751_defconfig | |||
@@ -1,10 +1,11 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29 | 3 | # Linux kernel version: 2.6.30-rc3 |
4 | # Thu Apr 2 18:59:59 2009 | 4 | # Mon Apr 27 13:06:44 2009 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
8 | # CONFIG_SUPERH64 is not set | ||
8 | CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" | 9 | CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" |
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 10 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
10 | CONFIG_GENERIC_BUG=y | 11 | CONFIG_GENERIC_BUG=y |
@@ -65,7 +66,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
65 | CONFIG_RD_GZIP=y | 66 | CONFIG_RD_GZIP=y |
66 | # CONFIG_RD_BZIP2 is not set | 67 | # CONFIG_RD_BZIP2 is not set |
67 | # CONFIG_RD_LZMA is not set | 68 | # CONFIG_RD_LZMA is not set |
68 | CONFIG_INITRAMFS_COMPRESSION_NONE=y | ||
69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
70 | CONFIG_SYSCTL=y | 70 | CONFIG_SYSCTL=y |
71 | CONFIG_ANON_INODES=y | 71 | CONFIG_ANON_INODES=y |
@@ -74,6 +74,7 @@ CONFIG_UID16=y | |||
74 | # CONFIG_SYSCTL_SYSCALL is not set | 74 | # CONFIG_SYSCTL_SYSCALL is not set |
75 | CONFIG_KALLSYMS=y | 75 | CONFIG_KALLSYMS=y |
76 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 76 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
77 | # CONFIG_STRIP_ASM_SYMS is not set | ||
77 | # CONFIG_HOTPLUG is not set | 78 | # CONFIG_HOTPLUG is not set |
78 | CONFIG_PRINTK=y | 79 | CONFIG_PRINTK=y |
79 | CONFIG_BUG=y | 80 | CONFIG_BUG=y |
@@ -92,6 +93,7 @@ CONFIG_SLAB=y | |||
92 | # CONFIG_SLUB is not set | 93 | # CONFIG_SLUB is not set |
93 | # CONFIG_SLOB is not set | 94 | # CONFIG_SLOB is not set |
94 | # CONFIG_PROFILING is not set | 95 | # CONFIG_PROFILING is not set |
96 | # CONFIG_MARKERS is not set | ||
95 | CONFIG_HAVE_OPROFILE=y | 97 | CONFIG_HAVE_OPROFILE=y |
96 | # CONFIG_KPROBES is not set | 98 | # CONFIG_KPROBES is not set |
97 | CONFIG_HAVE_IOREMAP_PROT=y | 99 | CONFIG_HAVE_IOREMAP_PROT=y |
@@ -99,6 +101,8 @@ CONFIG_HAVE_KPROBES=y | |||
99 | CONFIG_HAVE_KRETPROBES=y | 101 | CONFIG_HAVE_KRETPROBES=y |
100 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 102 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
101 | CONFIG_HAVE_CLK=y | 103 | CONFIG_HAVE_CLK=y |
104 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
105 | # CONFIG_SLOW_WORK is not set | ||
102 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | 106 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
103 | CONFIG_SLABINFO=y | 107 | CONFIG_SLABINFO=y |
104 | CONFIG_RT_MUTEXES=y | 108 | CONFIG_RT_MUTEXES=y |
@@ -110,7 +114,6 @@ CONFIG_MODULES=y | |||
110 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 114 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
111 | CONFIG_BLOCK=y | 115 | CONFIG_BLOCK=y |
112 | # CONFIG_LBD is not set | 116 | # CONFIG_LBD is not set |
113 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
114 | # CONFIG_BLK_DEV_BSG is not set | 117 | # CONFIG_BLK_DEV_BSG is not set |
115 | # CONFIG_BLK_DEV_INTEGRITY is not set | 118 | # CONFIG_BLK_DEV_INTEGRITY is not set |
116 | 119 | ||
@@ -156,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y | |||
156 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 159 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
157 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 160 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
158 | # CONFIG_CPU_SUBTYPE_SH7723 is not set | 161 | # CONFIG_CPU_SUBTYPE_SH7723 is not set |
162 | # CONFIG_CPU_SUBTYPE_SH7724 is not set | ||
159 | # CONFIG_CPU_SUBTYPE_SH7763 is not set | 163 | # CONFIG_CPU_SUBTYPE_SH7763 is not set |
160 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | 164 | # CONFIG_CPU_SUBTYPE_SH7770 is not set |
161 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | 165 | # CONFIG_CPU_SUBTYPE_SH7780 is not set |
@@ -165,8 +169,6 @@ CONFIG_CPU_SUBTYPE_SH7751=y | |||
165 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | 169 | # CONFIG_CPU_SUBTYPE_SH7343 is not set |
166 | # CONFIG_CPU_SUBTYPE_SH7722 is not set | 170 | # CONFIG_CPU_SUBTYPE_SH7722 is not set |
167 | # CONFIG_CPU_SUBTYPE_SH7366 is not set | 171 | # CONFIG_CPU_SUBTYPE_SH7366 is not set |
168 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set | ||
169 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set | ||
170 | 172 | ||
171 | # | 173 | # |
172 | # Memory management options | 174 | # Memory management options |
@@ -742,6 +744,11 @@ CONFIG_INOTIFY_USER=y | |||
742 | # CONFIG_FUSE_FS is not set | 744 | # CONFIG_FUSE_FS is not set |
743 | 745 | ||
744 | # | 746 | # |
747 | # Caches | ||
748 | # | ||
749 | # CONFIG_FSCACHE is not set | ||
750 | |||
751 | # | ||
745 | # CD-ROM/DVD Filesystems | 752 | # CD-ROM/DVD Filesystems |
746 | # | 753 | # |
747 | # CONFIG_ISO9660_FS is not set | 754 | # CONFIG_ISO9660_FS is not set |
@@ -796,6 +803,7 @@ CONFIG_JFFS2_RTIME=y | |||
796 | # CONFIG_ROMFS_FS is not set | 803 | # CONFIG_ROMFS_FS is not set |
797 | # CONFIG_SYSV_FS is not set | 804 | # CONFIG_SYSV_FS is not set |
798 | # CONFIG_UFS_FS is not set | 805 | # CONFIG_UFS_FS is not set |
806 | # CONFIG_NILFS2_FS is not set | ||
799 | CONFIG_NETWORK_FILESYSTEMS=y | 807 | CONFIG_NETWORK_FILESYSTEMS=y |
800 | # CONFIG_NFS_FS is not set | 808 | # CONFIG_NFS_FS is not set |
801 | # CONFIG_NFSD is not set | 809 | # CONFIG_NFSD is not set |
@@ -833,10 +841,23 @@ CONFIG_FRAME_WARN=1024 | |||
833 | CONFIG_HAVE_FUNCTION_TRACER=y | 841 | CONFIG_HAVE_FUNCTION_TRACER=y |
834 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 842 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
835 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 843 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
844 | CONFIG_TRACING_SUPPORT=y | ||
836 | 845 | ||
837 | # | 846 | # |
838 | # Tracers | 847 | # Tracers |
839 | # | 848 | # |
849 | # CONFIG_FUNCTION_TRACER is not set | ||
850 | # CONFIG_IRQSOFF_TRACER is not set | ||
851 | # CONFIG_SCHED_TRACER is not set | ||
852 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
853 | # CONFIG_EVENT_TRACER is not set | ||
854 | # CONFIG_BOOT_TRACER is not set | ||
855 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
856 | # CONFIG_STACK_TRACER is not set | ||
857 | # CONFIG_KMEMTRACE is not set | ||
858 | # CONFIG_WORKQUEUE_TRACER is not set | ||
859 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
860 | # CONFIG_DMA_API_DEBUG is not set | ||
840 | # CONFIG_SAMPLES is not set | 861 | # CONFIG_SAMPLES is not set |
841 | CONFIG_HAVE_ARCH_KGDB=y | 862 | CONFIG_HAVE_ARCH_KGDB=y |
842 | # CONFIG_SH_STANDARD_BIOS is not set | 863 | # CONFIG_SH_STANDARD_BIOS is not set |
@@ -936,6 +957,7 @@ CONFIG_CRYPTO=y | |||
936 | # | 957 | # |
937 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 958 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
938 | CONFIG_CRYPTO_HW=y | 959 | CONFIG_CRYPTO_HW=y |
960 | # CONFIG_BINARY_PRINTF is not set | ||
939 | 961 | ||
940 | # | 962 | # |
941 | # Library routines | 963 | # Library routines |