aboutsummaryrefslogtreecommitdiff
path: root/drivers/serial/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:31:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:31:07 +0000
commit64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch)
treea434977a6caa9b41cc0daaf71dbd76ac8693aba6 /drivers/serial/Kconfig
parentb93a4afcff7be859e30cad2a305731516057d6cf (diff)
parent17ccb834d517c66c09123c24ba8553c5b14e0f78 (diff)
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/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ebdd2b984d1..df62f4ea4f6 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