diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 14:36:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 14:36:03 -0400 |
commit | 7c7cbaf5b82c418cd3b1dcf718f71d0e6057e639 (patch) | |
tree | da9aaa5a246af464b1e10d88618c1cad07b76314 /arch/sh/configs/ecovec24_defconfig | |
parent | ba0234ec35127fe21d373db53cbaf9fe20620cb6 (diff) | |
parent | 4d0956b8f597aac10208ca763f8fe641fde16aab (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: (127 commits)
sh: update defconfigs.
sh: Fix up the NUMA build for recent LMB changes.
sh64: provide a stub per_cpu_trap_init() definition.
sh: fix up CONFIG_KEXEC=n build.
sh: fixup the docbook paths for clock framework shuffling.
driver core: Early dev_name() depends on slab_is_available().
sh: simplify WARN usage in SH clock driver
sh: Check return value of clk_get on ms7724
sh: Check return value of clk_get on ecovec24
sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c
sh: move sh clock.c contents to drivers/sh/clk.
sh: move sh asm/clock.h contents to linux/sh_clk.h V2
sh: remove unused clock lookup
sh: switch boards to clkdev
sh: switch sh4-202 to clkdev
sh: switch shx3 to clkdev
sh: switch sh7757 to clkdev
sh: switch sh7763 to clkdev
sh: switch sh7780 to clkdev
sh: switch sh7786 to clkdev
...
Diffstat (limited to 'arch/sh/configs/ecovec24_defconfig')
-rw-r--r-- | arch/sh/configs/ecovec24_defconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig index 6041c66dd10..67c665671c6 100644 --- a/arch/sh/configs/ecovec24_defconfig +++ b/arch/sh/configs/ecovec24_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.34-rc2 | 3 | # Linux kernel version: 2.6.34-rc5 |
4 | # Mon Mar 29 02:21:58 2010 | 4 | # Tue May 18 15:17:28 2010 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -336,6 +336,7 @@ CONFIG_SECCOMP=y | |||
336 | # CONFIG_PREEMPT_VOLUNTARY is not set | 336 | # CONFIG_PREEMPT_VOLUNTARY is not set |
337 | CONFIG_PREEMPT=y | 337 | CONFIG_PREEMPT=y |
338 | CONFIG_GUSA=y | 338 | CONFIG_GUSA=y |
339 | # CONFIG_INTC_USERIMASK is not set | ||
339 | 340 | ||
340 | # | 341 | # |
341 | # Boot options | 342 | # Boot options |
@@ -762,6 +763,7 @@ CONFIG_WLAN=y | |||
762 | # CONFIG_USB_PEGASUS is not set | 763 | # CONFIG_USB_PEGASUS is not set |
763 | # CONFIG_USB_RTL8150 is not set | 764 | # CONFIG_USB_RTL8150 is not set |
764 | # CONFIG_USB_USBNET is not set | 765 | # CONFIG_USB_USBNET is not set |
766 | # CONFIG_USB_IPHETH is not set | ||
765 | # CONFIG_WAN is not set | 767 | # CONFIG_WAN is not set |
766 | # CONFIG_PPP is not set | 768 | # CONFIG_PPP is not set |
767 | # CONFIG_SLIP is not set | 769 | # CONFIG_SLIP is not set |
@@ -1755,6 +1757,7 @@ CONFIG_CRYPTO_CBC=y | |||
1755 | # | 1757 | # |
1756 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1758 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
1757 | CONFIG_CRYPTO_HW=y | 1759 | CONFIG_CRYPTO_HW=y |
1760 | # CONFIG_VIRTUALIZATION is not set | ||
1758 | # CONFIG_BINARY_PRINTF is not set | 1761 | # CONFIG_BINARY_PRINTF is not set |
1759 | 1762 | ||
1760 | # | 1763 | # |