diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 17:07:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 17:07:35 -0400 |
commit | 15fc204afc6feb915c400159546f646eca8ba1d9 (patch) | |
tree | 51bec0710be2a0cb0bedbccbea7813f17fbc61ea /arch/sh/boards/Kconfig | |
parent | d2aa4550379f92e929af7ed1dd4f55e6a1e331f8 (diff) | |
parent | 944557116908cbe835be41bfbd39d9706da9fd71 (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: (56 commits)
sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn
sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
sh: remove stray markers.
sh: defconfig updates.
sh: pci: Initial PCI-Express support for SH7786 Urquell board.
sh: Generic HAVE_PERF_COUNTER support.
SH: convert migor to soc-camera as platform-device
SH: convert ap325rxa to soc-camera as platform-device
soc-camera: unify i2c camera device platform data
sh: add platform data for r8a66597-hcd in setup-sh7723
sh: add platform data for r8a66597-hcd in setup-sh7366
sh: x3proto: add platform data for r8a66597-hcd
sh: highlander: add platform data for r8a66597-hcd
sh: sh7785lcr: add platform data for r8a66597-hcd
sh: turn off irqs when disabling CMT/TMU timers
sh: use kzalloc() for cpg clocks
sh: unbreak WARN_ON()
sh: Use generic atomic64_t implementation.
sh: Revised clock function in highlander
sh: Update r7780mp defconfig
...
Diffstat (limited to 'arch/sh/boards/Kconfig')
-rw-r--r-- | arch/sh/boards/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index 1c91b1f565d5..2b1af0eefa6a 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig | |||
@@ -175,6 +175,7 @@ config SH_URQUELL | |||
175 | bool "Urquell" | 175 | bool "Urquell" |
176 | depends on CPU_SUBTYPE_SH7786 | 176 | depends on CPU_SUBTYPE_SH7786 |
177 | select ARCH_REQUIRE_GPIOLIB | 177 | select ARCH_REQUIRE_GPIOLIB |
178 | select SYS_SUPPORTS_PCI | ||
178 | 179 | ||
179 | config SH_MIGOR | 180 | config SH_MIGOR |
180 | bool "Migo-R" | 181 | bool "Migo-R" |