diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:23:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:23:21 -0400 |
| commit | ce8c2293be47999584908069e78bf6d94beadc53 (patch) | |
| tree | dfd6909e6866998d2103341b1e1af8c129d0cea8 /drivers/net/tg3.h | |
| parent | 41e9d344bf52c57ec16648d08618b61d3f1d4bdc (diff) | |
| parent | ee6a99b539a50b4e9398938a0a6d37f8bf911550 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
[TG3]: Fix msi issue with kexec/kdump.
[NET] XFRM: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
[NET] ROSE: Fix whitespace errors.
[NET] RFKILL: Fix whitespace errors.
[NET] PACKET: Fix whitespace errors.
[NET] NETROM: Fix whitespace errors.
[NET] NETFILTER: Fix whitespace errors.
[NET] IPV4: Fix whitespace errors.
[NET] DCCP: Fix whitespace errors.
[NET] CORE: Fix whitespace errors.
[NET] BLUETOOTH: Fix whitespace errors.
[NET] AX25: Fix whitespace errors.
[PATCH] mac80211: remove rtnl locking in ieee80211_sta.c
[PATCH] mac80211: fix GCC warning on 64bit platforms
[GENETLINK]: Dynamic multicast groups.
[NETLIKN]: Allow removing multicast groups.
...
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index d84e75e7365d..5c21f49026c9 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
| @@ -2345,6 +2345,7 @@ struct tg3 { | |||
| 2345 | #define PHY_REV_BCM5411_X0 0x1 /* Found on Netgear GA302T */ | 2345 | #define PHY_REV_BCM5411_X0 0x1 /* Found on Netgear GA302T */ |
| 2346 | 2346 | ||
| 2347 | u32 led_ctrl; | 2347 | u32 led_ctrl; |
| 2348 | u32 pci_cmd; | ||
| 2348 | 2349 | ||
| 2349 | char board_part_number[24]; | 2350 | char board_part_number[24]; |
| 2350 | char fw_ver[16]; | 2351 | char fw_ver[16]; |