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
/
amd8111e.h
diff --git
a/drivers/net/amd8111e.h
b/drivers/net/amd8111e.h
index
b5926af
..
2ff2e7a
100644
(file)
--- a/
drivers/net/amd8111e.h
+++ b/
drivers/net/amd8111e.h
@@
-783,9
+783,6
@@
struct amd8111e_priv{
struct net_device *next;
int mii;
struct mii_if_info mii_if;
-#if AMD8111E_VLAN_TAG_USED
- struct vlan_group *vlgrp;
-#endif
char opened;
unsigned int drv_rx_errors;
struct amd8111e_coalesce_conf coal_conf;