projects
/
oweals
/
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' of /home/stefan/git/u-boot/u-boot
[oweals/u-boot.git]
/
drivers
/
serial
/
mcfuart.c
diff --git
a/drivers/serial/mcfuart.c
b/drivers/serial/mcfuart.c
index bc7077de79e5d0d82c71a496e0d7bf5aa93d135d..88f3eb10abf8f3b4b67d5459b503cb3b6f8e7830 100644
(file)
--- a/
drivers/serial/mcfuart.c
+++ b/
drivers/serial/mcfuart.c
@@
-28,12
+28,14
@@
*/
#include <common.h>
+
+#ifdef CONFIG_MCFUART
+
#include <asm/immap.h>
#include <asm/uart.h>
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_MCFUART
extern void uart_port_conf(void);
int serial_init(void)