projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master'
[powerpc.git]
/
drivers
/
net
/
ibm_emac
/
ibm_emac_zmii.h
diff --git
a/drivers/net/ibm_emac/ibm_emac_zmii.h
b/drivers/net/ibm_emac/ibm_emac_zmii.h
index
0bb2606
..
92c8544
100644
(file)
--- a/
drivers/net/ibm_emac/ibm_emac_zmii.h
+++ b/
drivers/net/ibm_emac/ibm_emac_zmii.h
@@
-32,7
+32,7
@@
struct zmii_regs {
/* ZMII device */
struct ibm_ocp_zmii {
- struct zmii_regs *base;
+ struct zmii_regs
__iomem
*base;
int mode; /* subset of PHY_MODE_XXXX */
int users; /* number of EMACs using this ZMII bridge */
u32 fer_save; /* FER value left by firmware */