diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:31:07 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:31:07 +0000 |
| commit | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch) | |
| tree | a434977a6caa9b41cc0daaf71dbd76ac8693aba6 /drivers/serial/Kconfig | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable (diff) | |
| parent | ARM: mach-shmobile: ap4evb: Add KEYSC support (diff) | |
| download | linux-dev-64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39.tar.xz linux-dev-64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers/serial/Kconfig')
| -rw-r--r-- | drivers/serial/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index ebdd2b984d16..df62f4ea4f69 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -1003,7 +1003,7 @@ config SERIAL_IP22_ZILOG_CONSOLE config SERIAL_SH_SCI tristate "SuperH SCI(F) serial port support" - depends on HAVE_CLK && (SUPERH || H8300) + depends on HAVE_CLK && (SUPERH || H8300 || ARCH_SHMOBILE) select SERIAL_CORE config SERIAL_SH_SCI_NR_UARTS |