diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-20 16:35:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-20 16:35:04 -0800 |
| commit | af1e85a51b90c33285e3487409edc11f3850c735 (patch) | |
| tree | 4b201e9263e519855781546f85611216e321c609 /pci | |
| parent | 3d598405af1b25acadbe84b3e0c40a2476f2e5df (diff) | |
| download | patches-af1e85a51b90c33285e3487409edc11f3850c735.tar.gz | |
refresh of diff for 2.6.15-rc2
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci-pci_find_device-remove-pci-ppc.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pci/pci-pci_find_device-remove-pci-ppc.patch b/pci/pci-pci_find_device-remove-pci-ppc.patch index 437522aabe8d0..d65e0e69b4a5c 100644 --- a/pci/pci-pci_find_device-remove-pci-ppc.patch +++ b/pci/pci-pci_find_device-remove-pci-ppc.patch @@ -12,13 +12,12 @@ From: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> 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 -+++ gregkh-2.6/arch/ppc/kernel/pci.c -@@ -504,7 +504,7 @@ pcibios_allocate_resources(int pass) +--- 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 @@ u16 command; struct resource *r; @@ -27,7 +26,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]; -@@ -541,7 +541,7 @@ pcibios_assign_resources(void) +@@ -540,7 +540,7 @@ int idx; struct resource *r; @@ -36,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int class = dev->class >> 8; /* Don't touch classless devices and host bridges */ -@@ -869,14 +869,15 @@ pci_device_from_OF_node(struct device_no +@@ -868,14 +868,15 @@ */ if (!pci_to_OF_bus_map) return 0; |