git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
Kconfig
diff --git
a/drivers/tty/serial/Kconfig
b/drivers/tty/serial/Kconfig
index
8f41e11
..
4dcb37b
100644
(file)
--- a/
drivers/tty/serial/Kconfig
+++ b/
drivers/tty/serial/Kconfig
@@
-959,7
+959,7
@@
config SERIAL_IP22_ZILOG_CONSOLE
config SERIAL_SH_SCI
tristate "SuperH SCI(F) serial port support"
config SERIAL_SH_SCI
tristate "SuperH SCI(F) serial port support"
- depends on HAVE_CLK && (SUPERH ||
H8300 ||
ARCH_SHMOBILE)
+ depends on HAVE_CLK && (SUPERH || ARCH_SHMOBILE)
select SERIAL_CORE
config SERIAL_SH_SCI_NR_UARTS
select SERIAL_CORE
config SERIAL_SH_SCI_NR_UARTS
@@
-1404,7
+1404,7
@@
config SERIAL_SC26XX
config SERIAL_SC26XX_CONSOLE
bool "Console on SC2681/SC2692 serial port"
config SERIAL_SC26XX_CONSOLE
bool "Console on SC2681/SC2692 serial port"
- depends on SERIAL_SC26XX
+ depends on SERIAL_SC26XX
=y
select SERIAL_CORE_CONSOLE
help
Support for Console on SC2681/SC2692 serial ports.
select SERIAL_CORE_CONSOLE
help
Support for Console on SC2681/SC2692 serial ports.