diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-06 09:54:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-06 09:54:36 -0800 |
| commit | 02690392dc04877f3e799afb1bb520e366340955 (patch) | |
| tree | 7f55b589dfabd5d3ba2acb14a52b636f34c3cbd3 /pci | |
| parent | 0e330f1278ca2d1d4365b5646562c54d1cce78d2 (diff) | |
| download | patches-02690392dc04877f3e799afb1bb520e366340955.tar.gz | |
2.6.15-rc5 refresh
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci-error-recovery-e1000-network-device-driver.patch | 4 | ||||
| -rw-r--r-- | pci/pci-error-recovery-symbios-scsi-device-driver.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pci/pci-error-recovery-e1000-network-device-driver.patch b/pci/pci-error-recovery-e1000-network-device-driver.patch index 0cd54d497cfea..3332e5c1509ba 100644 --- a/pci/pci-error-recovery-e1000-network-device-driver.patch +++ b/pci/pci-error-recovery-e1000-network-device-driver.patch @@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); -@@ -2938,6 +2949,10 @@ e1000_update_stats(struct e1000_adapter +@@ -2926,6 +2937,10 @@ e1000_update_stats(struct e1000_adapter #define PHY_IDLE_ERROR_COUNT_MASK 0x00FF @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> spin_lock_irqsave(&adapter->stats_lock, flags); /* these counters are modified from e1000_adjust_tbi_stats, -@@ -4359,4 +4374,88 @@ e1000_netpoll(struct net_device *netdev) +@@ -4347,4 +4362,88 @@ e1000_netpoll(struct net_device *netdev) } #endif diff --git a/pci/pci-error-recovery-symbios-scsi-device-driver.patch b/pci/pci-error-recovery-symbios-scsi-device-driver.patch index 00e022fc1052f..cc6fd5ebeb3ff 100644 --- a/pci/pci-error-recovery-symbios-scsi-device-driver.patch +++ b/pci/pci-error-recovery-symbios-scsi-device-driver.patch @@ -162,7 +162,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * Driver host template. */ -@@ -2169,11 +2275,18 @@ static struct pci_device_id sym2_id_tabl +@@ -2172,11 +2278,18 @@ static struct pci_device_id sym2_id_tabl MODULE_DEVICE_TABLE(pci, sym2_id_table); |