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 git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[safe/jmp/linux-2.6]
/
drivers
/
net
/
acenic.h
diff --git
a/drivers/net/acenic.h
b/drivers/net/acenic.h
index
60ed183
..
c987c9b
100644
(file)
--- a/
drivers/net/acenic.h
+++ b/
drivers/net/acenic.h
@@
-693,8
+693,11
@@
struct ace_private
__attribute__ ((aligned (SMP_CACHE_BYTES)));
u32 last_tx, last_std_rx, last_mini_rx;
#endif
- struct net_device_stats stats;
int pci_using_dac;
+ u8 firmware_major;
+ u8 firmware_minor;
+ u8 firmware_fix;
+ u32 firmware_start;
};