aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--pci/pci-powerpc-use-generic-pci_enable_resources.patch2
-rw-r--r--version2
2 files changed, 2 insertions, 2 deletions
diff --git a/pci/pci-powerpc-use-generic-pci_enable_resources.patch b/pci/pci-powerpc-use-generic-pci_enable_resources.patch
index 27a90cdc062f23..f643f7a874a09f 100644
--- a/pci/pci-powerpc-use-generic-pci_enable_resources.patch
+++ b/pci/pci-powerpc-use-generic-pci_enable_resources.patch
@@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
-@@ -1155,41 +1155,9 @@ EXPORT_SYMBOL_GPL(pcibios_claim_one_bus)
+@@ -1161,41 +1161,9 @@ EXPORT_SYMBOL_GPL(pcibios_claim_one_bus)
int pcibios_enable_device(struct pci_dev *dev, int mask)
{
diff --git a/version b/version
index b3656bea59c03a..446ddfa46521de 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.25-rc5-git2
+2.6.25-rc5-git3