diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-18 11:28:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-18 11:28:05 -0800 |
| commit | 7695771e986729e6eae9fac3657668fbf01b19b1 (patch) | |
| tree | 04c16c11fcd7cb117fe138738bdbd481fdc53c77 /pci | |
| parent | 05f961a7cefc2f1441dcbaef4b175023c44b2342 (diff) | |
| download | patches-7695771e986729e6eae9fac3657668fbf01b19b1.tar.gz | |
new usb patches and 2.6.16-rc1 refresh
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci-hotplug-shpchp-amd-pogo-errata-fix.patch | 6 | ||||
| -rw-r--r-- | pci/pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pci/pci-hotplug-shpchp-amd-pogo-errata-fix.patch b/pci/pci-hotplug-shpchp-amd-pogo-errata-fix.patch index c0514b9358a9f..6e10d29e294ac 100644 --- a/pci/pci-hotplug-shpchp-amd-pogo-errata-fix.patch +++ b/pci/pci-hotplug-shpchp-amd-pogo-errata-fix.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/hotplug/shpchp.h +++ gregkh-2.6/drivers/pci/hotplug/shpchp.h -@@ -96,6 +96,7 @@ struct controller { +@@ -95,6 +95,7 @@ struct controller { u8 function; u8 slot_device_offset; u8 add_support; @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> enum pci_bus_speed speed; u32 first_slot; /* First physical slot number */ u8 slot_bus; /* Bus where the slots handled by this controller sit */ -@@ -114,6 +115,26 @@ struct hotplug_params { +@@ -113,6 +114,26 @@ struct hotplug_params { /* Define AMD SHPC ID */ #define PCI_DEVICE_ID_AMD_GOLAM_7450 0x7450 @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define INT_BUTTON_IGNORE 0 #define INT_PRESENCE_ON 1 -@@ -334,6 +355,79 @@ static inline int wait_for_ctrl_irq (str +@@ -333,6 +354,79 @@ static inline int wait_for_ctrl_irq (str return retval; } diff --git a/pci/pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch b/pci/pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch index 008a53a89228e..aa4d693af775d 100644 --- a/pci/pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch +++ b/pci/pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/quirks.c +++ gregkh-2.6/drivers/pci/quirks.c -@@ -1239,6 +1239,33 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN +@@ -1242,6 +1242,33 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXHV, quirk_pcie_pxh); |