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' of git://git.denx.de/u-boot-samsung
[platform/kernel/u-boot.git]
/
include
/
iomux.h
diff --git
a/include/iomux.h
b/include/iomux.h
index
257c1f7
..
e38a81e
100644
(file)
--- a/
include/iomux.h
+++ b/
include/iomux.h
@@
-24,7
+24,7
@@
#ifndef _IO_MUX_H
#define _IO_MUX_H
#ifndef _IO_MUX_H
#define _IO_MUX_H
-#include <
devices
.h>
+#include <
stdio_dev
.h>
/*
* Stuff required to support console multiplexing.
/*
* Stuff required to support console multiplexing.
@@
-34,7
+34,7
@@
* Pointers to devices used for each file type. Defined in console.c
* but storage is allocated in iomux.c.
*/
* Pointers to devices used for each file type. Defined in console.c
* but storage is allocated in iomux.c.
*/
-extern
device_t
**console_devices[MAX_FILES];
+extern
struct stdio_dev
**console_devices[MAX_FILES];
/*
* The count of devices assigned to each FILE. Defined in console.c
* and populated in iomux.c.
/*
* The count of devices assigned to each FILE. Defined in console.c
* and populated in iomux.c.
@@
-43,6
+43,6
@@
extern int cd_count[MAX_FILES];
int iomux_doenv(const int, const char *);
void iomux_printdevs(const int);
int iomux_doenv(const int, const char *);
void iomux_printdevs(const int);
-
device_t
*search_device(int, char *);
+
struct stdio_dev
*search_device(int, char *);
#endif /* _IO_MUX_H */
#endif /* _IO_MUX_H */