git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
macb.h
diff --git
a/drivers/net/macb.h
b/drivers/net/macb.h
index
57b85ac
..
d3212f6
100644
(file)
--- a/
drivers/net/macb.h
+++ b/
drivers/net/macb.h
@@
-384,7
+384,7
@@
struct macb {
unsigned int rx_pending, tx_pending;
- struct mii_bus mii_bus;
+ struct mii_bus
*
mii_bus;
struct phy_device *phy_dev;
unsigned int link;
unsigned int speed;