aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-01-10 12:31:39 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-10 12:31:39 -0800
commit9dcb2938b76dd4ee67232a6f812117b8097a85c1 (patch)
treeeada5738bbd6d44e149ca8ab861dee25a0246a66 /pci
parent3871c527fe1cef5a8a6a5cd4613e0f583307a4dc (diff)
downloadpatches-9dcb2938b76dd4ee67232a6f812117b8097a85c1.tar.gz
more patches added
Diffstat (limited to 'pci')
-rw-r--r--pci/pci-restore-2-missing-pci-ids.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/pci/pci-restore-2-missing-pci-ids.patch b/pci/pci-restore-2-missing-pci-ids.patch
new file mode 100644
index 0000000000000..f66e2d84a5460
--- /dev/null
+++ b/pci/pci-restore-2-missing-pci-ids.patch
@@ -0,0 +1,40 @@
+From akpm@osdl.org Thu Jan 5 22:49:02 2006
+From: Mark Rustad <MRustad@mac.com>
+Message-Id: <200601060647.k066lfQU008736@shell0.pdx.osdl.net>
+Subject: PCI: restore 2 missing pci ids
+To: greg@kroah.com
+Cc: akpm@osdl.org, MRustad@mac.com, mrustad@mac.com
+Date: Thu, 05 Jan 2006 22:47:29 -0800
+
+
+From: Mark Rustad <MRustad@mac.com>
+
+Somewhere between 2.6.14 and 2.6.15-rc3, some PCI ids were apparently
+removed. The ecc.c module, which is not a part of the kernel.org tree, but
+included in some distributions, fails to compile.
+
+Signed-off-by: Mark Rustad <mrustad@mac.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ include/linux/pci_ids.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- gregkh-2.6.orig/include/linux/pci_ids.h
++++ gregkh-2.6/include/linux/pci_ids.h
+@@ -2049,6 +2049,7 @@
+ #define PCI_DEVICE_ID_INTEL_82801EB_5 0x24d5
+ #define PCI_DEVICE_ID_INTEL_82801EB_6 0x24d6
+ #define PCI_DEVICE_ID_INTEL_82801EB_11 0x24db
++#define PCI_DEVICE_ID_INTEL_82801EB_13 0x24dd
+ #define PCI_DEVICE_ID_INTEL_ESB_1 0x25a1
+ #define PCI_DEVICE_ID_INTEL_ESB_2 0x25a2
+ #define PCI_DEVICE_ID_INTEL_ESB_4 0x25a4
+@@ -2138,6 +2139,7 @@
+ #define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2
+ #define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601
+ #define PCI_DEVICE_ID_INTEL_82454GX 0x84c4
++#define PCI_DEVICE_ID_INTEL_82450GX 0x84c5
+ #define PCI_DEVICE_ID_INTEL_82451NX 0x84ca
+ #define PCI_DEVICE_ID_INTEL_82454NX 0x84cb
+ #define PCI_DEVICE_ID_INTEL_84460GX 0x84ea