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 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
drivers
/
net
/
macb.h
diff --git
a/drivers/net/macb.h
b/drivers/net/macb.h
index
4e3283e
..
57b85ac
100644
(file)
--- a/
drivers/net/macb.h
+++ b/
drivers/net/macb.h
@@
-374,6
+374,7
@@
struct macb {
struct clk *pclk;
struct clk *hclk;
struct net_device *dev;
+ struct napi_struct napi;
struct net_device_stats stats;
struct macb_stats hw_stats;