diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 03:28:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 03:29:05 -0400 |
| commit | 29e2035bddecce3eb584a8304528b50da8370a24 (patch) | |
| tree | 13155df7d90a8e287b83a1cd6c0d02c3018212ab /drivers/net/netxen/netxen_nic.h | |
| parent | 868489660dabc0c28087cca3dbc1adbbc398c6fe (diff) | |
| parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
Merge branch 'linus' into core/rcu
Merge reason: Avoid fuzz in init/main.c and update from rc6 to rc8.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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; |