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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[pandora-kernel.git]
/
drivers
/
net
/
e1000
/
e1000.h
diff --git
a/drivers/net/e1000/e1000.h
b/drivers/net/e1000/e1000.h
index
689f158
..
dd4b728
100644
(file)
--- a/
drivers/net/e1000/e1000.h
+++ b/
drivers/net/e1000/e1000.h
@@
-337,7
+337,6
@@
struct e1000_adapter {
struct e1000_rx_ring test_rx_ring;
- uint32_t *config_space;
int msg_enable;
#ifdef CONFIG_PCI_MSI
boolean_t have_msi;