aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-05-31 13:58:52 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-05-31 13:58:52 -0700
commit79831534f914a3465ebed3770938094b3b18bb8e (patch)
treeb173f7c746e4bb675f78178a7ab7398ddb25aa8e /pci
parentcd9f6ed81e278f7a5b8984132fde66b61e0bb856 (diff)
downloadpatches-79831534f914a3465ebed3770938094b3b18bb8e.tar.gz
refresh and add airprime driver update
Diffstat (limited to 'pci')
-rw-r--r--pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch2
-rw-r--r--pci/pci-move-various-pci-ids-to-header-file.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch b/pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch
index c0bf57bd24664..157e504375523 100644
--- a/pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch
+++ b/pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch
@@ -74,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct hlist_head saved_cap_space;
--- gregkh-2.6.orig/include/linux/pci_ids.h
+++ gregkh-2.6/include/linux/pci_ids.h
-@@ -1939,6 +1939,7 @@
+@@ -1940,6 +1940,7 @@
#define PCI_VENDOR_ID_MELLANOX 0x15b3
#define PCI_DEVICE_ID_MELLANOX_TAVOR 0x5a44
diff --git a/pci/pci-move-various-pci-ids-to-header-file.patch b/pci/pci-move-various-pci-ids-to-header-file.patch
index b756cf404ec7d..31961bff06645 100644
--- a/pci/pci-move-various-pci-ids-to-header-file.patch
+++ b/pci/pci-move-various-pci-ids-to-header-file.patch
@@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100
#define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200
#define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300
-@@ -1963,6 +1968,9 @@
+@@ -1964,6 +1969,9 @@
#define PCI_VENDOR_ID_NETCELL 0x169c
#define PCI_DEVICE_ID_REVOLUTION 0x0044
@@ -101,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_LINKSYS 0x1737
#define PCI_DEVICE_ID_LINKSYS_EG1064 0x1064
-@@ -2141,6 +2149,7 @@
+@@ -2142,6 +2150,7 @@
#define PCI_DEVICE_ID_INTEL_ICH8_4 0x2815
#define PCI_DEVICE_ID_INTEL_ICH8_5 0x283e
#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850