diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /drivers/net/s2io.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'drivers/net/s2io.h')
| -rw-r--r-- | drivers/net/s2io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 6722a2f7d09..55cb943f23f 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
| @@ -962,6 +962,7 @@ struct s2io_nic { | |||
| 962 | int task_flag; | 962 | int task_flag; |
| 963 | unsigned long long start_time; | 963 | unsigned long long start_time; |
| 964 | struct vlan_group *vlgrp; | 964 | struct vlan_group *vlgrp; |
| 965 | int vlan_strip_flag; | ||
| 965 | #define MSIX_FLG 0xA5 | 966 | #define MSIX_FLG 0xA5 |
| 966 | int num_entries; | 967 | int num_entries; |
| 967 | struct msix_entry *entries; | 968 | struct msix_entry *entries; |