diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-04 05:22:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-04 05:22:21 -0400 |
| commit | a29889a5369d2604c2053bcd051519a2445d8a70 (patch) | |
| tree | b17e8258894d079b4168994d9438ba7d6e7d1523 /drivers/net/netxen/netxen_nic.h | |
| parent | e7a088f935180b90cfe6ab0aaae8a556f46885fe (diff) | |
| parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/netxen/netxen_nic.h')
| -rw-r--r-- | drivers/net/netxen/netxen_nic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index f86e05047d19..a9c1fcca5e75 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
| @@ -1254,7 +1254,7 @@ struct netxen_adapter { | |||
| 1254 | u8 mc_enabled; | 1254 | u8 mc_enabled; |
| 1255 | u8 max_mc_count; | 1255 | u8 max_mc_count; |
| 1256 | u8 rss_supported; | 1256 | u8 rss_supported; |
| 1257 | u8 resv2; | 1257 | u8 link_changed; |
| 1258 | u32 resv3; | 1258 | u32 resv3; |
| 1259 | 1259 | ||
| 1260 | u8 has_link_events; | 1260 | u8 has_link_events; |