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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
sh
/
configs
/
rts7751r2d1_defconfig
diff --git
a/arch/sh/configs/rts7751r2d1_defconfig
b/arch/sh/configs/rts7751r2d1_defconfig
index
fba1f62
..
dba024d
100644
(file)
--- a/
arch/sh/configs/rts7751r2d1_defconfig
+++ b/
arch/sh/configs/rts7751r2d1_defconfig
@@
-877,7
+877,7
@@
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
#
# CONFIG_SERIAL_MAX3100 is not set
CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=
1
+CONFIG_SERIAL_SH_SCI_NR_UARTS=
2
CONFIG_SERIAL_SH_SCI_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y