diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-21 16:09:45 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-21 16:09:45 -0800 |
| commit | 6d5ed6dd27445aa3fcc53869ad425d332eda96a5 (patch) | |
| tree | 0fa607bfe71cf04fa759896caabf7b0853c7ea14 /pci | |
| parent | 8f201a7bdcb0d5b5a2987d01e1433f0a09968d6d (diff) | |
| download | patches-6d5ed6dd27445aa3fcc53869ad425d332eda96a5.tar.gz | |
refresh after moving into proper places
Diffstat (limited to 'pci')
3 files changed, 9 insertions, 8 deletions
diff --git a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch index 664043e9f51bc..a44c25aacb66c 100644 --- a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch +++ b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch @@ -514,7 +514,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit tc35815_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/tg3.c +++ gregkh-2.6/drivers/net/tg3.c -@@ -10930,7 +10930,7 @@ static struct pci_driver tg3_driver = { +@@ -10946,7 +10946,7 @@ static struct pci_driver tg3_driver = { static int __init tg3_init(void) { diff --git a/pci/pci-pci_find_device-remove-pci-mpc85xx_cds_common.patch b/pci/pci-pci_find_device-remove-pci-mpc85xx_cds_common.patch index 80b0f455f3250..292de6631d923 100644 --- a/pci/pci-pci_find_device-remove-pci-mpc85xx_cds_common.patch +++ b/pci/pci-pci_find_device-remove-pci-mpc85xx_cds_common.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/ppc/platforms/85xx/mpc85xx_cds_common.c +++ gregkh-2.6/arch/ppc/platforms/85xx/mpc85xx_cds_common.c -@@ -350,10 +350,10 @@ mpc85xx_cds_fixup_via(struct pci_control +@@ -351,10 +351,10 @@ mpc85xx_cds_fixup_via(struct pci_control void __init mpc85xx_cds_pcibios_fixup(void) { @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> PCI_DEVICE_ID_VIA_82C586_1, NULL))) { /* * U-Boot does not set the enable bits -@@ -370,21 +370,24 @@ mpc85xx_cds_pcibios_fixup(void) +@@ -371,21 +371,24 @@ mpc85xx_cds_pcibios_fixup(void) */ dev->irq = 14; pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); diff --git a/pci/pci-pci_find_device-remove-pci-ppc.patch b/pci/pci-pci_find_device-remove-pci-ppc.patch index d65e0e69b4a5c..9d2394216406f 100644 --- a/pci/pci-pci_find_device-remove-pci-ppc.patch +++ b/pci/pci-pci_find_device-remove-pci-ppc.patch @@ -15,9 +15,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> arch/ppc/kernel/pci.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) ---- gregkh-2.6.orig/arch/ppc/kernel/pci.c 2005-11-20 16:32:40.000000000 -0800 -+++ gregkh-2.6/arch/ppc/kernel/pci.c 2005-11-20 16:32:42.000000000 -0800 -@@ -503,7 +503,7 @@ +--- +--- gregkh-2.6.orig/arch/ppc/kernel/pci.c ++++ gregkh-2.6/arch/ppc/kernel/pci.c +@@ -503,7 +503,7 @@ pcibios_allocate_resources(int pass) u16 command; struct resource *r; @@ -26,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pci_read_config_word(dev, PCI_COMMAND, &command); for (idx = 0; idx < 6; idx++) { r = &dev->resource[idx]; -@@ -540,7 +540,7 @@ +@@ -540,7 +540,7 @@ pcibios_assign_resources(void) int idx; struct resource *r; @@ -35,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int class = dev->class >> 8; /* Don't touch classless devices and host bridges */ -@@ -868,14 +868,15 @@ +@@ -868,14 +868,15 @@ pci_device_from_OF_node(struct device_no */ if (!pci_to_OF_bus_map) return 0; |