diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-09 09:31:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-09 09:31:24 -0800 |
| commit | 6bda7dc4404f8d79ce7b2586717fea2407db20cc (patch) | |
| tree | d2a19ac4c75845ec6565c447d1bb1fb20beaebf9 /pci | |
| parent | 567e1b1f7355701fc4fd949a3f87067003c3f494 (diff) | |
| download | patches-6bda7dc4404f8d79ce7b2586717fea2407db20cc.tar.gz | |
2.6.15-git5 refresh
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/drivers-block-replace-pci_module_init-with-pci_register_driver.patch | 8 | ||||
| -rw-r--r-- | pci/pci-error-recovery-documentation.patch | 2 | ||||
| -rw-r--r-- | pci/pciehp-handle-sticky-power-fault-status.patch | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pci/drivers-block-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-block-replace-pci_module_init-with-pci_register_driver.patch index b3b035b10cc49..0f6e5271547ac 100644 --- a/pci/drivers-block-replace-pci_module_init-with-pci_register_driver.patch +++ b/pci/drivers-block-replace-pci_module_init-with-pci_register_driver.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/block/cciss.c +++ gregkh-2.6/drivers/block/cciss.c -@@ -3274,7 +3274,7 @@ static int __init cciss_init(void) +@@ -3340,7 +3340,7 @@ static int __init cciss_init(void) printk(KERN_INFO DRIVER_NAME "\n"); /* Register for our PCI devices */ @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit cciss_cleanup(void) --- gregkh-2.6.orig/drivers/block/DAC960.c +++ gregkh-2.6/drivers/block/DAC960.c -@@ -7186,7 +7186,7 @@ static int DAC960_init_module(void) +@@ -7179,7 +7179,7 @@ static int DAC960_init_module(void) { int ret; @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> DAC960_gam_init(); --- gregkh-2.6.orig/drivers/block/sx8.c +++ gregkh-2.6/drivers/block/sx8.c -@@ -1774,7 +1774,7 @@ static void carm_remove_one (struct pci_ +@@ -1755,7 +1755,7 @@ static void carm_remove_one (struct pci_ static int __init carm_init(void) { @@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit carm_exit(void) --- gregkh-2.6.orig/drivers/block/umem.c +++ gregkh-2.6/drivers/block/umem.c -@@ -1185,7 +1185,7 @@ static int __init mm_init(void) +@@ -1174,7 +1174,7 @@ static int __init mm_init(void) printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n"); diff --git a/pci/pci-error-recovery-documentation.patch b/pci/pci-error-recovery-documentation.patch index dcef613dbda14..11f9b55dbec2d 100644 --- a/pci/pci-error-recovery-documentation.patch +++ b/pci/pci-error-recovery-documentation.patch @@ -272,7 +272,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +Revised: 31 May 2005 Linas Vepstas <linas@austin.ibm.com> --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -1996,6 +1996,13 @@ M: hch@infradead.org +@@ -1995,6 +1995,13 @@ M: hch@infradead.org L: linux-abi-devel@lists.sourceforge.net S: Maintained diff --git a/pci/pciehp-handle-sticky-power-fault-status.patch b/pci/pciehp-handle-sticky-power-fault-status.patch index a3b46c9b50b26..44e2ef711a473 100644 --- a/pci/pciehp-handle-sticky-power-fault-status.patch +++ b/pci/pciehp-handle-sticky-power-fault-status.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c +++ gregkh-2.6/drivers/pci/hotplug/pciehp_hpc.c -@@ -784,8 +784,13 @@ static int hpc_power_on_slot(struct slot +@@ -787,8 +787,13 @@ static int hpc_power_on_slot(struct slot slot_cmd = (slot_ctrl & ~PWR_CTRL) | POWER_ON; @@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> retval = pcie_write_cmd(slot, slot_cmd); -@@ -830,8 +835,18 @@ static int hpc_power_off_slot(struct slo +@@ -833,8 +838,18 @@ static int hpc_power_off_slot(struct slo slot_cmd = (slot_ctrl & ~PWR_CTRL) | POWER_OFF; |