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://www.denx.de/git/u-boot-ppc4xx
[platform/kernel/u-boot.git]
/
include
/
ioports.h
diff --git
a/include/ioports.h
b/include/ioports.h
index
91ca6fb
..
1134ea5
100644
(file)
--- a/
include/ioports.h
+++ b/
include/ioports.h
@@
-26,7
+26,7
@@
typedef struct {
* a 0x20 byte boundary
*/
#ifdef CONFIG_MPC85xx
* a 0x20 byte boundary
*/
#ifdef CONFIG_MPC85xx
-#define ioport_addr(im, idx) (ioport_t *)((uint)&(
(im)->im_cpm.
im_cpm_iop) + ((idx)*0x20))
+#define ioport_addr(im, idx) (ioport_t *)((uint)&(
im->
im_cpm_iop) + ((idx)*0x20))
#else
#define ioport_addr(im, idx) (ioport_t *)((uint)&(im)->im_ioport + ((idx)*0x20))
#endif
#else
#define ioport_addr(im, idx) (ioport_t *)((uint)&(im)->im_ioport + ((idx)*0x20))
#endif
@@
-63,4
+63,3
@@
typedef struct {
} qe_iop_conf_t;
#define QE_IOP_TAB_END (-1)
} qe_iop_conf_t;
#define QE_IOP_TAB_END (-1)
-