more patches added

2 files changed, 140 insertions, 0 deletions

diff --git a/pci/pci-fix-pciehp-compile-issue-when-config_acpi-is-not-enabled.patch b/pci/pci-fix-pciehp-compile-issue-when-config_acpi-is-not-enabled.patch
new file mode 100644
index 0000000000000..3e7e2636357df
--- /dev/null
+++ b/pci/pci-fix-pciehp-compile-issue-when-config_acpi-is-not-enabled.patch
@@ -0,0 +1,29 @@
+From akpm@osdl.org Sat May 13 08:33:56 2006
+Message-Id: <200605131533.k4DFXpMY016119@shell0.pdx.osdl.net>
+From: Kristen Accardi <kristen.c.accardi@intel.com>
+Subject: PCI: fix pciehp compile issue when CONFIG_ACPI is not enabled
+To: kristen.c.accardi@intel.com, greg@kroah.com, mm-commits@vger.kernel.org
+From: akpm@osdl.org
+Date: Sat, 13 May 2006 08:30:52 -0700
+
+Fix build error when CONFIG_ACPI not defined
+
+Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/linux/pci-acpi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/include/linux/pci-acpi.h
++++ gregkh-2.6/include/linux/pci-acpi.h
+@@ -50,7 +50,7 @@
+ extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags);
+ extern acpi_status pci_osc_support_set(u32 flags);
+ #else
+-#if !defined(acpi_status)
++#if !defined(AE_ERROR)
+ typedef u32 		acpi_status;
+ #define AE_ERROR      	(acpi_status) (0x0001)
+ #endif    
diff --git a/pci/pci-move-various-pci-ids-to-header-file.patch b/pci/pci-move-various-pci-ids-to-header-file.patch
new file mode 100644
index 0000000000000..24181fdfe414a
--- /dev/null
+++ b/pci/pci-move-various-pci-ids-to-header-file.patch
@@ -0,0 +1,111 @@
+From akpm@osdl.org Wed May 10 01:52:10 2006
+Message-Id: <200605100851.k4A8ptdA006903@shell0.pdx.osdl.net>
+From: Brent Casavant <bcasavan@sgi.com>
+Subject: PCI: Move various PCI IDs to header file
+To: bcasavan@sgi.com, greg@kroah.com, jes@sgi.com, mm-commits@vger.kernel.org
+Date: Wed, 10 May 2006 01:49:14 -0700
+
+From: Brent Casavant <bcasavan@sgi.com>
+
+Move various QLogic, Vitesse, and Intel storage controller PCI IDs to the
+main header file.
+
+Signed-off-by: Brent Casavant <bcasavan@sgi.com>
+Acked-by: Jes Sorensen <jes@sgi.com>
+Cc: Greg KH <greg@kroah.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+---
+
+ drivers/scsi/qla1280.c  |   24 ------------------------
+ drivers/scsi/sata_vsc.c |   11 ++++++-----
+ include/linux/pci_ids.h |    9 +++++++++
+ 3 files changed, 15 insertions(+), 29 deletions(-)
+
+--- gregkh-2.6.orig/drivers/scsi/qla1280.c
++++ gregkh-2.6/drivers/scsi/qla1280.c
+@@ -397,30 +397,6 @@
+ #include "ql1280_fw.h"
+ #include "ql1040_fw.h"
+ 
+-
+-/*
+- * Missing PCI ID's
+- */
+-#ifndef PCI_DEVICE_ID_QLOGIC_ISP1080
+-#define PCI_DEVICE_ID_QLOGIC_ISP1080	0x1080
+-#endif
+-#ifndef PCI_DEVICE_ID_QLOGIC_ISP1240
+-#define PCI_DEVICE_ID_QLOGIC_ISP1240	0x1240
+-#endif
+-#ifndef PCI_DEVICE_ID_QLOGIC_ISP1280
+-#define PCI_DEVICE_ID_QLOGIC_ISP1280	0x1280
+-#endif
+-#ifndef PCI_DEVICE_ID_QLOGIC_ISP10160
+-#define PCI_DEVICE_ID_QLOGIC_ISP10160	0x1016
+-#endif
+-#ifndef PCI_DEVICE_ID_QLOGIC_ISP12160
+-#define PCI_DEVICE_ID_QLOGIC_ISP12160	0x1216
+-#endif
+-
+-#ifndef PCI_VENDOR_ID_AMI
+-#define PCI_VENDOR_ID_AMI               0x101e
+-#endif
+-
+ #ifndef BITS_PER_LONG
+ #error "BITS_PER_LONG not defined!"
+ #endif
+--- gregkh-2.6.orig/drivers/scsi/sata_vsc.c
++++ gregkh-2.6/drivers/scsi/sata_vsc.c
+@@ -433,13 +433,14 @@ err_out:
+ 
+ 
+ /*
+- * 0x1725/0x7174 is the Vitesse VSC-7174
+- * 0x8086/0x3200 is the Intel 31244, which is supposed to be identical
+- * compatibility is untested as of yet
++ * Intel 31244 is supposed to be identical.
++ * Compatibility is untested as of yet.
+  */
+ static const struct pci_device_id vsc_sata_pci_tbl[] = {
+-	{ 0x1725, 0x7174, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
+-	{ 0x8086, 0x3200, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
++	{ PCI_VENDOR_ID_VITESSE, PCI_DEVICE_ID_VITESSE_VSC7174,
++	  PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
++	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GD31244,
++	  PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
+ 	{ }
+ };
+ 
+--- gregkh-2.6.orig/include/linux/pci_ids.h
++++ gregkh-2.6/include/linux/pci_ids.h
+@@ -851,7 +851,12 @@
+ 
+ 
+ #define PCI_VENDOR_ID_QLOGIC		0x1077
++#define PCI_DEVICE_ID_QLOGIC_ISP10160	0x1016
+ #define PCI_DEVICE_ID_QLOGIC_ISP1020	0x1020
++#define PCI_DEVICE_ID_QLOGIC_ISP1080	0x1080
++#define PCI_DEVICE_ID_QLOGIC_ISP12160	0x1216
++#define PCI_DEVICE_ID_QLOGIC_ISP1240	0x1240
++#define PCI_DEVICE_ID_QLOGIC_ISP1280	0x1280
+ #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 @@
+ #define PCI_VENDOR_ID_NETCELL		0x169c
+ #define PCI_DEVICE_ID_REVOLUTION	0x0044
+ 
++#define PCI_VENDOR_ID_VITESSE		0x1725
++#define PCI_DEVICE_ID_VITESSE_VSC7174	0x7174
++
+ #define PCI_VENDOR_ID_LINKSYS		0x1737
+ #define PCI_DEVICE_ID_LINKSYS_EG1064	0x1064
+ 
+@@ -2141,6 +2149,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
++#define PCI_DEVICE_ID_INTEL_GD31244	0x3200
+ #define PCI_DEVICE_ID_INTEL_82855PM_HB	0x3340
+ #define PCI_DEVICE_ID_INTEL_82830_HB	0x3575
+ #define PCI_DEVICE_ID_INTEL_82830_CGC	0x3577