diff options
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 59579b1d8843..311ca266bd77 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -47,12 +47,6 @@ static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation | |||
47 | * Macro expands to... | 47 | * Macro expands to... |
48 | * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} | 48 | * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} |
49 | */ | 49 | */ |
50 | #ifdef CONFIG_E1000E_ENABLED | ||
51 | #define PCIE(x) | ||
52 | #else | ||
53 | #define PCIE(x) x, | ||
54 | #endif | ||
55 | |||
56 | static struct pci_device_id e1000_pci_tbl[] = { | 50 | static struct pci_device_id e1000_pci_tbl[] = { |
57 | INTEL_E1000_ETHERNET_DEVICE(0x1000), | 51 | INTEL_E1000_ETHERNET_DEVICE(0x1000), |
58 | INTEL_E1000_ETHERNET_DEVICE(0x1001), | 52 | INTEL_E1000_ETHERNET_DEVICE(0x1001), |
@@ -79,14 +73,6 @@ static struct pci_device_id e1000_pci_tbl[] = { | |||
79 | INTEL_E1000_ETHERNET_DEVICE(0x1026), | 73 | INTEL_E1000_ETHERNET_DEVICE(0x1026), |
80 | INTEL_E1000_ETHERNET_DEVICE(0x1027), | 74 | INTEL_E1000_ETHERNET_DEVICE(0x1027), |
81 | INTEL_E1000_ETHERNET_DEVICE(0x1028), | 75 | INTEL_E1000_ETHERNET_DEVICE(0x1028), |
82 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1049)) | ||
83 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x104A)) | ||
84 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x104B)) | ||
85 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x104C)) | ||
86 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x104D)) | ||
87 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x105E)) | ||
88 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x105F)) | ||
89 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1060)) | ||
90 | INTEL_E1000_ETHERNET_DEVICE(0x1075), | 76 | INTEL_E1000_ETHERNET_DEVICE(0x1075), |
91 | INTEL_E1000_ETHERNET_DEVICE(0x1076), | 77 | INTEL_E1000_ETHERNET_DEVICE(0x1076), |
92 | INTEL_E1000_ETHERNET_DEVICE(0x1077), | 78 | INTEL_E1000_ETHERNET_DEVICE(0x1077), |
@@ -95,28 +81,9 @@ PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1060)) | |||
95 | INTEL_E1000_ETHERNET_DEVICE(0x107A), | 81 | INTEL_E1000_ETHERNET_DEVICE(0x107A), |
96 | INTEL_E1000_ETHERNET_DEVICE(0x107B), | 82 | INTEL_E1000_ETHERNET_DEVICE(0x107B), |
97 | INTEL_E1000_ETHERNET_DEVICE(0x107C), | 83 | INTEL_E1000_ETHERNET_DEVICE(0x107C), |
98 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x107D)) | ||
99 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x107E)) | ||
100 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x107F)) | ||
101 | INTEL_E1000_ETHERNET_DEVICE(0x108A), | 84 | INTEL_E1000_ETHERNET_DEVICE(0x108A), |
102 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x108B)) | ||
103 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x108C)) | ||
104 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1096)) | ||
105 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x1098)) | ||
106 | INTEL_E1000_ETHERNET_DEVICE(0x1099), | 85 | INTEL_E1000_ETHERNET_DEVICE(0x1099), |
107 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x109A)) | ||
108 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10A4)) | ||
109 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10A5)) | ||
110 | INTEL_E1000_ETHERNET_DEVICE(0x10B5), | 86 | INTEL_E1000_ETHERNET_DEVICE(0x10B5), |
111 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10B9)) | ||
112 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10BA)) | ||
113 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10BB)) | ||
114 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10BC)) | ||
115 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10C4)) | ||
116 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10C5)) | ||
117 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10D5)) | ||
118 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10D9)) | ||
119 | PCIE( INTEL_E1000_ETHERNET_DEVICE(0x10DA)) | ||
120 | /* required last entry */ | 87 | /* required last entry */ |
121 | {0,} | 88 | {0,} |
122 | }; | 89 | }; |
@@ -5284,7 +5251,6 @@ e1000_netpoll(struct net_device *netdev) | |||
5284 | 5251 | ||
5285 | disable_irq(adapter->pdev->irq); | 5252 | disable_irq(adapter->pdev->irq); |
5286 | e1000_intr(adapter->pdev->irq, netdev); | 5253 | e1000_intr(adapter->pdev->irq, netdev); |
5287 | e1000_clean_tx_irq(adapter, adapter->tx_ring); | ||
5288 | #ifndef CONFIG_E1000_NAPI | 5254 | #ifndef CONFIG_E1000_NAPI |
5289 | adapter->clean_rx(adapter, adapter->rx_ring); | 5255 | adapter->clean_rx(adapter, adapter->rx_ring); |
5290 | #endif | 5256 | #endif |