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 'master' into for-next
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
devices-mx23.h
diff --git
a/arch/arm/mach-mxs/devices-mx23.h
b/arch/arm/mach-mxs/devices-mx23.h
index
d0f49fc
..
1256788
100644
(file)
--- a/
arch/arm/mach-mxs/devices-mx23.h
+++ b/
arch/arm/mach-mxs/devices-mx23.h
@@
-11,6
+11,6
@@
#include <mach/mx23.h>
#include <mach/devices-common.h>
#include <mach/mx23.h>
#include <mach/devices-common.h>
-extern const struct
mxs_duart_data mx23_duart_data
__initconst;
+extern const struct
amba_device mx23_duart_device
__initconst;
#define mx23_add_duart() \
#define mx23_add_duart() \
- mxs_add_duart(&mx23_duart_d
ata
)
+ mxs_add_duart(&mx23_duart_d
evice
)