diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-30 11:48:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-30 11:48:32 -0700 |
| commit | 0f23e8e35c820146f6939c5164a1115d58855bcd (patch) | |
| tree | e7e0c35b962d368a64e743870a08780c51d0c4ea /pci | |
| parent | 96ffa47b02cad44e503659d011d12d82661c9f15 (diff) | |
| download | patches-0f23e8e35c820146f6939c5164a1115d58855bcd.tar.gz | |
refresh
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch index 71a26ba463a1a..31df65f649b2d 100644 --- a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch +++ b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch @@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* required last entry */ {0,} }; -@@ -619,7 +619,14 @@ e1000_probe(struct pci_dev *pdev, +@@ -621,7 +621,14 @@ e1000_probe(struct pci_dev *pdev, int i, err, pci_using_dac; uint16_t eeprom_data; uint16_t eeprom_apme_mask = E1000_EEPROM_APME; @@ -159,7 +159,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return err; if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) { -@@ -652,6 +659,7 @@ e1000_probe(struct pci_dev *pdev, +@@ -654,6 +661,7 @@ e1000_probe(struct pci_dev *pdev, adapter->pdev = pdev; adapter->hw.back = adapter; adapter->msg_enable = (1 << debug) - 1; @@ -167,7 +167,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mmio_start = pci_resource_start(pdev, BAR_0); mmio_len = pci_resource_len(pdev, BAR_0); -@@ -662,12 +670,15 @@ e1000_probe(struct pci_dev *pdev, +@@ -664,12 +672,15 @@ e1000_probe(struct pci_dev *pdev, goto err_ioremap; } @@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -4575,7 +4586,7 @@ e1000_resume(struct pci_dev *pdev) +@@ -4577,7 +4588,7 @@ e1000_resume(struct pci_dev *pdev) if (retval) DPRINTK(PROBE, ERR, "Error in setting power state\n"); e1000_pci_restore_state(adapter); |