diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 19:54:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 19:54:27 -0500 |
commit | 64d497f55379b1e320a08ec2426468d96f5642ec (patch) | |
tree | 22b9ab3c5e69c5cc2728cbc2ca7fc7623beef8f1 /arch/sh/boards/Kconfig | |
parent | 37d4008484977f60d5d37499a2670c79b214dd46 (diff) | |
parent | b5f5fe80fa98a60daa0fa94512d1599b1e26674c (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: (187 commits)
sh: remove dead LED code for migo-r and ms7724se
sh: ecovec build fix for CONFIG_I2C=n
sh: ecovec r-standby support
sh: ms7724se r-standby support
sh: SH-Mobile R-standby register save/restore
clocksource: Fix up a registration/IRQ race in the sh drivers.
sh: ms7724: modify scan_timing for KEYSC
sh: ms7724: Add sh_sir support
sh: mach-ecovec24: Add sh_sir support
sh: wire up SET/GET_UNALIGN_CTL.
sh: allow alignment fault mode to be configured at kernel boot.
sh: sh7724: Update FSI/SPU2 clock
sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec
sh: add sh7724 kick callback to clk_div4_table
sh: introduce struct clk_div4_table
sh: clock-cpg div4 set_rate() shift fix
sh: Turn on speculative return for SH7785 and SH7786
sh: Merge legacy and dynamic PMB modes.
sh: Use uncached I/O helpers in PMB setup.
sh: Provide uncached I/O helpers.
...
Diffstat (limited to 'arch/sh/boards/Kconfig')
-rw-r--r-- | arch/sh/boards/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index aedd9deb5de2..938e87d51482 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig | |||
@@ -150,6 +150,14 @@ config SH_SDK7780 | |||
150 | Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3 | 150 | Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3 |
151 | evaluation board. | 151 | evaluation board. |
152 | 152 | ||
153 | config SH_SDK7786 | ||
154 | bool "SDK7786" | ||
155 | depends on CPU_SUBTYPE_SH7786 | ||
156 | select SYS_SUPPORTS_PCI | ||
157 | help | ||
158 | Select SDK7786 if configuring for a Renesas Technology Europe | ||
159 | SH7786-65nm board. | ||
160 | |||
153 | config SH_HIGHLANDER | 161 | config SH_HIGHLANDER |
154 | bool "Highlander" | 162 | bool "Highlander" |
155 | depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 | 163 | depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 |