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 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
Kconfig
diff --git
a/arch/cris/arch-v32/drivers/Kconfig
b/arch/cris/arch-v32/drivers/Kconfig
index
fdf3faa
..
a2dd740
100644
(file)
--- a/
arch/cris/arch-v32/drivers/Kconfig
+++ b/
arch/cris/arch-v32/drivers/Kconfig
@@
-360,7
+360,7
@@
config ETRAX_SER4_DSR_BIT
string "Ser 4 DSR bit (empty = not used)"
depends on ETRAX_SERIAL_PORT4
-config ETRAX_SER
3
_CD_BIT
+config ETRAX_SER
4
_CD_BIT
string "Ser 4 CD bit (empty = not used)"
depends on ETRAX_SERIAL_PORT4