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 'fix/misc' into topic/misc
[pandora-kernel.git]
/
drivers
/
net
/
sunbmac.h
diff --git
a/drivers/net/sunbmac.h
b/drivers/net/sunbmac.h
index
8840bc0
..
8db8894
100644
(file)
--- a/
drivers/net/sunbmac.h
+++ b/
drivers/net/sunbmac.h
@@
-329,8
+329,8
@@
struct bigmac {
unsigned int timer_ticks;
struct net_device_stats enet_stats;
- struct
of_device
*qec_op;
- struct
of_device
*bigmac_op;
+ struct
platform_device
*qec_op;
+ struct
platform_device
*bigmac_op;
struct net_device *dev;
};