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 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
Kconfig
diff --git
a/drivers/tty/serial/Kconfig
b/drivers/tty/serial/Kconfig
index
925a1e5
..
3771277
100644
(file)
--- a/
drivers/tty/serial/Kconfig
+++ b/
drivers/tty/serial/Kconfig
@@
-464,7
+464,7
@@
config SERIAL_SAMSUNG_UARTS_4
config SERIAL_SAMSUNG_UARTS
int
depends on ARM && PLAT_SAMSUNG
- default 6 if
ARCH
_S5P6450
+ default 6 if
CPU
_S5P6450
default 4 if SERIAL_SAMSUNG_UARTS_4
default 3
help