git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
e1000
/
e1000.h
diff --git
a/drivers/net/e1000/e1000.h
b/drivers/net/e1000/e1000.h
index
108e331
..
77db789
100644
(file)
--- a/
drivers/net/e1000/e1000.h
+++ b/
drivers/net/e1000/e1000.h
@@
-54,7
+54,7
@@
#include <linux/string.h>
#include <linux/pagemap.h>
#include <linux/dma-mapping.h>
#include <linux/string.h>
#include <linux/pagemap.h>
#include <linux/dma-mapping.h>
-#include <
asm
/bitops.h>
+#include <
linux
/bitops.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <linux/capability.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <linux/capability.h>
@@
-64,7
+64,6
@@
#include <linux/udp.h>
#include <net/pkt_sched.h>
#include <linux/list.h>
#include <linux/udp.h>
#include <net/pkt_sched.h>
#include <linux/list.h>
-#include <linux/rtnetlink.h>
#include <linux/reboot.h>
#ifdef NETIF_F_TSO
#include <net/checksum.h>
#include <linux/reboot.h>
#ifdef NETIF_F_TSO
#include <net/checksum.h>
@@
-73,7
+72,6
@@
#include <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/if_vlan.h>
#include <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/if_vlan.h>
-#include <linux/moduleparam.h>
#define BAR_0 0
#define BAR_1 1
#define BAR_0 0
#define BAR_1 1
@@
-254,7
+252,6
@@
struct e1000_adapter {
struct e1000_desc_ring test_rx_ring;
struct e1000_desc_ring test_rx_ring;
- uint32_t pci_state[16];
int msg_enable;
};
#endif /* _E1000_H_ */
int msg_enable;
};
#endif /* _E1000_H_ */