diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-25 10:44:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-25 10:44:14 -0400 |
commit | 53cddfcc0e760d2b364878b6dadbd0c6d087cfae (patch) | |
tree | 3f2471b2452467b50c80cd61b12f708b2df39e0e /arch/sh/configs/ecovec24-romimage_defconfig | |
parent | c09c2d1089b55a3da7058a2f1a76c2f21c8b0688 (diff) | |
parent | a79aebfca1e597c1aab4b8e327028f96f5ea9095 (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:
sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
sh: Add support DMA Engine to SH7780
sh: Add support DMA Engine to SH7722
sh: enable onenand support in kfr2r09 defconfig.
sh: update defconfigs.
sh: add FSI driver support for ms7724se
sh: Fix up uninitialized variable use caught by gcc 4.4.
sh: Handle unaligned 16-bit instructions on SH-2A.
sh: mach-ecovec24: Add active low setting for sh_eth
sh: includecheck fix: dwarf.c
Diffstat (limited to 'arch/sh/configs/ecovec24-romimage_defconfig')
-rw-r--r-- | arch/sh/configs/ecovec24-romimage_defconfig | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig index 9a22c64775b..0774924623c 100644 --- a/arch/sh/configs/ecovec24-romimage_defconfig +++ b/arch/sh/configs/ecovec24-romimage_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-rc7 | 3 | # Linux kernel version: 2.6.31 |
4 | # Tue Sep 8 13:56:18 2009 | 4 | # Thu Sep 24 17:56:41 2009 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -59,11 +59,12 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
59 | # | 59 | # |
60 | # RCU Subsystem | 60 | # RCU Subsystem |
61 | # | 61 | # |
62 | CONFIG_CLASSIC_RCU=y | 62 | CONFIG_TREE_RCU=y |
63 | # CONFIG_TREE_RCU is not set | 63 | # CONFIG_TREE_PREEMPT_RCU is not set |
64 | # CONFIG_PREEMPT_RCU is not set | 64 | # CONFIG_RCU_TRACE is not set |
65 | CONFIG_RCU_FANOUT=32 | ||
66 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
65 | # CONFIG_TREE_RCU_TRACE is not set | 67 | # CONFIG_TREE_RCU_TRACE is not set |
66 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
67 | CONFIG_IKCONFIG=y | 68 | CONFIG_IKCONFIG=y |
68 | CONFIG_IKCONFIG_PROC=y | 69 | CONFIG_IKCONFIG_PROC=y |
69 | CONFIG_LOG_BUF_SHIFT=14 | 70 | CONFIG_LOG_BUF_SHIFT=14 |
@@ -79,15 +80,9 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
79 | # CONFIG_NAMESPACES is not set | 80 | # CONFIG_NAMESPACES is not set |
80 | CONFIG_BLK_DEV_INITRD=y | 81 | CONFIG_BLK_DEV_INITRD=y |
81 | CONFIG_INITRAMFS_SOURCE="" | 82 | CONFIG_INITRAMFS_SOURCE="" |
82 | CONFIG_INITRAMFS_ROOT_UID=0 | ||
83 | CONFIG_INITRAMFS_ROOT_GID=0 | ||
84 | CONFIG_RD_GZIP=y | 83 | CONFIG_RD_GZIP=y |
85 | # CONFIG_RD_BZIP2 is not set | 84 | # CONFIG_RD_BZIP2 is not set |
86 | # CONFIG_RD_LZMA is not set | 85 | # CONFIG_RD_LZMA is not set |
87 | CONFIG_INITRAMFS_COMPRESSION_NONE=y | ||
88 | # CONFIG_INITRAMFS_COMPRESSION_GZIP is not set | ||
89 | # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set | ||
90 | # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set | ||
91 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 86 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
92 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
93 | CONFIG_ANON_INODES=y | 88 | CONFIG_ANON_INODES=y |
@@ -107,20 +102,19 @@ CONFIG_TIMERFD=y | |||
107 | CONFIG_EVENTFD=y | 102 | CONFIG_EVENTFD=y |
108 | CONFIG_SHMEM=y | 103 | CONFIG_SHMEM=y |
109 | CONFIG_AIO=y | 104 | CONFIG_AIO=y |
110 | CONFIG_HAVE_PERF_COUNTERS=y | 105 | CONFIG_HAVE_PERF_EVENTS=y |
111 | 106 | ||
112 | # | 107 | # |
113 | # Performance Counters | 108 | # Kernel Performance Events And Counters |
114 | # | 109 | # |
110 | # CONFIG_PERF_EVENTS is not set | ||
115 | # CONFIG_PERF_COUNTERS is not set | 111 | # CONFIG_PERF_COUNTERS is not set |
116 | CONFIG_VM_EVENT_COUNTERS=y | 112 | CONFIG_VM_EVENT_COUNTERS=y |
117 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_COMPAT_BRK=y | 113 | CONFIG_COMPAT_BRK=y |
119 | CONFIG_SLAB=y | 114 | CONFIG_SLAB=y |
120 | # CONFIG_SLUB is not set | 115 | # CONFIG_SLUB is not set |
121 | # CONFIG_SLOB is not set | 116 | # CONFIG_SLOB is not set |
122 | # CONFIG_PROFILING is not set | 117 | # CONFIG_PROFILING is not set |
123 | # CONFIG_MARKERS is not set | ||
124 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
125 | CONFIG_HAVE_IOREMAP_PROT=y | 119 | CONFIG_HAVE_IOREMAP_PROT=y |
126 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
@@ -237,6 +231,7 @@ CONFIG_ZONE_DMA_FLAG=0 | |||
237 | CONFIG_NR_QUICK=2 | 231 | CONFIG_NR_QUICK=2 |
238 | CONFIG_HAVE_MLOCK=y | 232 | CONFIG_HAVE_MLOCK=y |
239 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 233 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
234 | # CONFIG_KSM is not set | ||
240 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 235 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
241 | 236 | ||
242 | # | 237 | # |
@@ -319,7 +314,8 @@ CONFIG_GUSA=y | |||
319 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | 314 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 |
320 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 315 | CONFIG_BOOT_LINK_OFFSET=0x00800000 |
321 | CONFIG_ENTRY_OFFSET=0x00001000 | 316 | CONFIG_ENTRY_OFFSET=0x00001000 |
322 | CONFIG_CMDLINE_BOOL=y | 317 | CONFIG_CMDLINE_OVERWRITE=y |
318 | # CONFIG_CMDLINE_EXTEND is not set | ||
323 | CONFIG_CMDLINE="console=ttySC0,115200" | 319 | CONFIG_CMDLINE="console=ttySC0,115200" |
324 | 320 | ||
325 | # | 321 | # |
@@ -382,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
382 | # CONFIG_NETFILTER is not set | 378 | # CONFIG_NETFILTER is not set |
383 | # CONFIG_IP_DCCP is not set | 379 | # CONFIG_IP_DCCP is not set |
384 | # CONFIG_IP_SCTP is not set | 380 | # CONFIG_IP_SCTP is not set |
381 | # CONFIG_RDS is not set | ||
385 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
386 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
387 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
@@ -422,6 +419,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
422 | # Generic Driver Options | 419 | # Generic Driver Options |
423 | # | 420 | # |
424 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 421 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
422 | # CONFIG_DEVTMPFS is not set | ||
425 | CONFIG_STANDALONE=y | 423 | CONFIG_STANDALONE=y |
426 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 424 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
427 | CONFIG_FW_LOADER=y | 425 | CONFIG_FW_LOADER=y |
@@ -530,10 +528,7 @@ CONFIG_SH_ETH=y | |||
530 | # CONFIG_KS8842 is not set | 528 | # CONFIG_KS8842 is not set |
531 | # CONFIG_NETDEV_1000 is not set | 529 | # CONFIG_NETDEV_1000 is not set |
532 | # CONFIG_NETDEV_10000 is not set | 530 | # CONFIG_NETDEV_10000 is not set |
533 | 531 | CONFIG_WLAN=y | |
534 | # | ||
535 | # Wireless LAN | ||
536 | # | ||
537 | # CONFIG_WLAN_PRE80211 is not set | 532 | # CONFIG_WLAN_PRE80211 is not set |
538 | # CONFIG_WLAN_80211 is not set | 533 | # CONFIG_WLAN_80211 is not set |
539 | 534 | ||
@@ -625,6 +620,7 @@ CONFIG_HW_RANDOM=y | |||
625 | # CONFIG_TCG_TPM is not set | 620 | # CONFIG_TCG_TPM is not set |
626 | CONFIG_I2C=y | 621 | CONFIG_I2C=y |
627 | CONFIG_I2C_BOARDINFO=y | 622 | CONFIG_I2C_BOARDINFO=y |
623 | CONFIG_I2C_COMPAT=y | ||
628 | # CONFIG_I2C_CHARDEV is not set | 624 | # CONFIG_I2C_CHARDEV is not set |
629 | CONFIG_I2C_HELPER_AUTO=y | 625 | CONFIG_I2C_HELPER_AUTO=y |
630 | 626 | ||
@@ -657,9 +653,6 @@ CONFIG_I2C_SH_MOBILE=y | |||
657 | # Miscellaneous I2C Chip support | 653 | # Miscellaneous I2C Chip support |
658 | # | 654 | # |
659 | # CONFIG_DS1682 is not set | 655 | # CONFIG_DS1682 is not set |
660 | # CONFIG_SENSORS_PCF8574 is not set | ||
661 | # CONFIG_PCF8575 is not set | ||
662 | # CONFIG_SENSORS_PCA9539 is not set | ||
663 | # CONFIG_SENSORS_TSL2550 is not set | 656 | # CONFIG_SENSORS_TSL2550 is not set |
664 | # CONFIG_I2C_DEBUG_CORE is not set | 657 | # CONFIG_I2C_DEBUG_CORE is not set |
665 | # CONFIG_I2C_DEBUG_ALGO is not set | 658 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -693,11 +686,14 @@ CONFIG_GPIO_SYSFS=y | |||
693 | # | 686 | # |
694 | # SPI GPIO expanders: | 687 | # SPI GPIO expanders: |
695 | # | 688 | # |
689 | |||
690 | # | ||
691 | # AC97 GPIO expanders: | ||
692 | # | ||
696 | # CONFIG_W1 is not set | 693 | # CONFIG_W1 is not set |
697 | # CONFIG_POWER_SUPPLY is not set | 694 | # CONFIG_POWER_SUPPLY is not set |
698 | # CONFIG_HWMON is not set | 695 | # CONFIG_HWMON is not set |
699 | # CONFIG_THERMAL is not set | 696 | # CONFIG_THERMAL is not set |
700 | # CONFIG_THERMAL_HWMON is not set | ||
701 | # CONFIG_WATCHDOG is not set | 697 | # CONFIG_WATCHDOG is not set |
702 | CONFIG_SSB_POSSIBLE=y | 698 | CONFIG_SSB_POSSIBLE=y |
703 | 699 | ||
@@ -717,6 +713,7 @@ CONFIG_SSB_POSSIBLE=y | |||
717 | # CONFIG_MFD_TMIO is not set | 713 | # CONFIG_MFD_TMIO is not set |
718 | # CONFIG_PMIC_DA903X is not set | 714 | # CONFIG_PMIC_DA903X is not set |
719 | # CONFIG_MFD_WM8400 is not set | 715 | # CONFIG_MFD_WM8400 is not set |
716 | # CONFIG_MFD_WM831X is not set | ||
720 | # CONFIG_MFD_WM8350_I2C is not set | 717 | # CONFIG_MFD_WM8350_I2C is not set |
721 | # CONFIG_MFD_PCF50633 is not set | 718 | # CONFIG_MFD_PCF50633 is not set |
722 | # CONFIG_AB3100_CORE is not set | 719 | # CONFIG_AB3100_CORE is not set |
@@ -771,6 +768,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
771 | # CONFIG_USB_OXU210HP_HCD is not set | 768 | # CONFIG_USB_OXU210HP_HCD is not set |
772 | # CONFIG_USB_ISP116X_HCD is not set | 769 | # CONFIG_USB_ISP116X_HCD is not set |
773 | # CONFIG_USB_ISP1760_HCD is not set | 770 | # CONFIG_USB_ISP1760_HCD is not set |
771 | # CONFIG_USB_ISP1362_HCD is not set | ||
774 | # CONFIG_USB_SL811_HCD is not set | 772 | # CONFIG_USB_SL811_HCD is not set |
775 | CONFIG_USB_R8A66597_HCD=y | 773 | CONFIG_USB_R8A66597_HCD=y |
776 | # CONFIG_USB_HWA_HCD is not set | 774 | # CONFIG_USB_HWA_HCD is not set |
@@ -875,6 +873,7 @@ CONFIG_EXT2_FS=y | |||
875 | # CONFIG_XFS_FS is not set | 873 | # CONFIG_XFS_FS is not set |
876 | # CONFIG_OCFS2_FS is not set | 874 | # CONFIG_OCFS2_FS is not set |
877 | # CONFIG_BTRFS_FS is not set | 875 | # CONFIG_BTRFS_FS is not set |
876 | # CONFIG_NILFS2_FS is not set | ||
878 | CONFIG_FILE_LOCKING=y | 877 | CONFIG_FILE_LOCKING=y |
879 | # CONFIG_FSNOTIFY is not set | 878 | # CONFIG_FSNOTIFY is not set |
880 | # CONFIG_DNOTIFY is not set | 879 | # CONFIG_DNOTIFY is not set |
@@ -975,6 +974,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
975 | # CONFIG_ENABLE_MUST_CHECK is not set | 974 | # CONFIG_ENABLE_MUST_CHECK is not set |
976 | CONFIG_FRAME_WARN=1024 | 975 | CONFIG_FRAME_WARN=1024 |
977 | # CONFIG_MAGIC_SYSRQ is not set | 976 | # CONFIG_MAGIC_SYSRQ is not set |
977 | # CONFIG_STRIP_ASM_SYMS is not set | ||
978 | # CONFIG_UNUSED_SYMBOLS is not set | 978 | # CONFIG_UNUSED_SYMBOLS is not set |
979 | CONFIG_DEBUG_FS=y | 979 | CONFIG_DEBUG_FS=y |
980 | # CONFIG_HEADERS_CHECK is not set | 980 | # CONFIG_HEADERS_CHECK is not set |
@@ -989,7 +989,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
989 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y | 989 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y |
990 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 990 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
991 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 991 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
992 | CONFIG_HAVE_FTRACE_SYSCALLS=y | 992 | CONFIG_HAVE_SYSCALL_TRACEPOINTS=y |
993 | CONFIG_TRACING_SUPPORT=y | 993 | CONFIG_TRACING_SUPPORT=y |
994 | # CONFIG_FTRACE is not set | 994 | # CONFIG_FTRACE is not set |
995 | # CONFIG_DYNAMIC_DEBUG is not set | 995 | # CONFIG_DYNAMIC_DEBUG is not set |