projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
mv-common.h
diff --git
a/include/configs/mv-common.h
b/include/configs/mv-common.h
index
fa275d6
..
3dfcb13
100644
(file)
--- a/
include/configs/mv-common.h
+++ b/
include/configs/mv-common.h
@@
-33,7
+33,7
@@
* NS16550 Configuration
*/
#define CFG_SYS_NS16550_CLK CFG_SYS_TCLK
-#if !
defined(CONFIG_
DM_SERIAL)
+#if !
CONFIG_IS_ENABLED(
DM_SERIAL)
#define CFG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE
#endif