diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-13 22:59:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-13 22:59:44 -0400 |
| commit | 5c16807d3d196203d2d3c9fae51ac7e422091904 (patch) | |
| tree | 850c33533f80fe426b477c4660c61ba22315a808 /drivers/net/netxen/netxen_nic.h | |
| parent | e5e2a8fd8358d1b3a2c51c3248edee72e4194703 (diff) | |
| parent | 232e7d68d50c9ac3a55d716e5ae215ecd1e043b9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/netxen/netxen_nic_main.c
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 ae81f7022d23..5abb41e2d02c 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
| @@ -1112,7 +1112,7 @@ struct netxen_adapter { | |||
| 1112 | u8 mc_enabled; | 1112 | u8 mc_enabled; |
| 1113 | u8 max_mc_count; | 1113 | u8 max_mc_count; |
| 1114 | u8 rss_supported; | 1114 | u8 rss_supported; |
| 1115 | u8 resv2; | 1115 | u8 link_changed; |
| 1116 | u32 resv3; | 1116 | u32 resv3; |
| 1117 | 1117 | ||
| 1118 | u8 has_link_events; | 1118 | u8 has_link_events; |