git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
s2io.h
diff --git
a/drivers/net/s2io.h
b/drivers/net/s2io.h
index
800b3a4
..
ae3c8e7
100644
(file)
--- a/
drivers/net/s2io.h
+++ b/
drivers/net/s2io.h
@@
-939,7
+939,6
@@
struct s2io_nic {
int task_flag;
unsigned long long start_time;
- struct vlan_group *vlgrp;
int vlan_strip_flag;
#define MSIX_FLG 0xA5
int num_entries;