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 git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
drivers
/
serial
/
arm_dcc.c
diff --git
a/drivers/serial/arm_dcc.c
b/drivers/serial/arm_dcc.c
index dca73b93d0024ea185ac16586c6e56a1a5575dab..7b5ecb5132d0de3bd5c508448579caea717104e0 100644
(file)
--- a/
drivers/serial/arm_dcc.c
+++ b/
drivers/serial/arm_dcc.c
@@
-27,7
+27,7
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <
devices
.h>
+#include <
stdio_dev
.h>
#if defined(CONFIG_CPU_V6)
/*
#if defined(CONFIG_CPU_V6)
/*
@@
-148,7
+148,7
@@
int arm_dcc_tstc(void)
}
#ifdef CONFIG_ARM_DCC_MULTI
}
#ifdef CONFIG_ARM_DCC_MULTI
-static
device_t
arm_dcc_dev;
+static
struct stdio_dev
arm_dcc_dev;
int drv_arm_dcc_init(void)
{
int drv_arm_dcc_init(void)
{
@@
-165,6
+165,6
@@
int drv_arm_dcc_init(void)
arm_dcc_dev.putc = arm_dcc_putc; /* 'putc' function */
arm_dcc_dev.puts = arm_dcc_puts; /* 'puts' function */
arm_dcc_dev.putc = arm_dcc_putc; /* 'putc' function */
arm_dcc_dev.puts = arm_dcc_puts; /* 'puts' function */
- return
device
_register(&arm_dcc_dev);
+ return
stdio
_register(&arm_dcc_dev);
}
#endif
}
#endif