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 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
atlx
/
atl2.h
diff --git
a/drivers/net/atlx/atl2.h
b/drivers/net/atlx/atl2.h
index
927e4de
..
78344dd
100644
(file)
--- a/
drivers/net/atlx/atl2.h
+++ b/
drivers/net/atlx/atl2.h
@@
-453,9
+453,6
@@
struct atl2_adapter {
/* OS defined structs */
struct net_device *netdev;
struct pci_dev *pdev;
/* OS defined structs */
struct net_device *netdev;
struct pci_dev *pdev;
-#ifdef NETIF_F_HW_VLAN_TX
- struct vlan_group *vlgrp;
-#endif
u32 wol;
u16 link_speed;
u16 link_duplex;
u32 wol;
u16 link_speed;
u16 link_duplex;