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 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
atlx
/
atl1.h
diff --git
a/drivers/net/atlx/atl1.h
b/drivers/net/atlx/atl1.h
index
68de8cb
..
109d6da
100644
(file)
--- a/
drivers/net/atlx/atl1.h
+++ b/
drivers/net/atlx/atl1.h
@@
-753,7
+753,6
@@
struct atl1_adapter {
struct pci_dev *pdev;
struct atl1_sft_stats soft_stats;
- struct vlan_group *vlgrp;
u32 rx_buffer_len;
u32 wol;
u16 link_speed;