Merge branch 'linus' into cpus4096

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index 4487f32759a4..c987c9b5a137 100644
--- a/drivers/net/acenic.h
+++ b/drivers/net/acenic.h
@@ -694,6 +694,10 @@ struct ace_private
         u32                     last_tx, last_std_rx, last_mini_rx;
 #endif
         int                     pci_using_dac;
+        u8                      firmware_major;
+        u8                      firmware_minor;
+        u8                      firmware_fix;
+        u32                     firmware_start;
 };