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 'u-boot-microblaze/mainline/arm' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
drivers
/
net
/
fec_mxc.h
diff --git
a/drivers/net/fec_mxc.h
b/drivers/net/fec_mxc.h
index 203285af9a10e1dfe8718f258c7b6b8db0d0575e..b8f0da36cdc4e9c8080eb0b4c552bb226dce5664 100644
(file)
--- a/
drivers/net/fec_mxc.h
+++ b/
drivers/net/fec_mxc.h
@@
-271,11
+271,11
@@
struct fec_priv {
bd_t *bd;
uint8_t *tdb_ptr;
int dev_id;
- int phy_id;
struct mii_dev *bus;
#ifdef CONFIG_PHYLIB
struct phy_device *phydev;
#else
+ int phy_id;
int (*mii_postcall)(int);
#endif
};