diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /drivers/net/tg3.h | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 8936edfb0438..ae5da603c6af 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
| @@ -2762,6 +2762,10 @@ struct tg3 { | |||
| 2762 | #define SST_25VF0X0_PAGE_SIZE 4098 | 2762 | #define SST_25VF0X0_PAGE_SIZE 4098 |
| 2763 | 2763 | ||
| 2764 | struct ethtool_coalesce coal; | 2764 | struct ethtool_coalesce coal; |
| 2765 | |||
| 2766 | /* firmware info */ | ||
| 2767 | const struct firmware *fw; | ||
| 2768 | u32 fw_len; /* includes BSS */ | ||
| 2765 | }; | 2769 | }; |
| 2766 | 2770 | ||
| 2767 | #endif /* !(_T3_H) */ | 2771 | #endif /* !(_T3_H) */ |