aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-01 19:49:02 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-01 19:49:02 +0000
commit23c3f7941e51e2ef7e44397634135064d12dc611 (patch)
tree13c0688a40ff2655f33d033cd3eac5d6bddde1eb /target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
parent4bc1ddec227a285a19f09e8ca3be32cb05ee275b (diff)
downloadmaster-187ad058-23c3f7941e51e2ef7e44397634135064d12dc611.tar.gz
master-187ad058-23c3f7941e51e2ef7e44397634135064d12dc611.tar.bz2
master-187ad058-23c3f7941e51e2ef7e44397634135064d12dc611.zip
kernel: update linux 3.2 to 3.2.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30767 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
index 2a31a2089d..b1eed44d6f 100644
--- a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
+++ b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
@@ -2071,7 +2071,7 @@
/**
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -1522,12 +1522,14 @@ unsigned int __devinit pci_scan_child_bu
+@@ -1527,12 +1527,14 @@ unsigned int __devinit pci_scan_child_bu
return max;
}
@@ -2089,7 +2089,7 @@
b = pci_alloc_bus();
if (!b)
-@@ -1577,8 +1579,20 @@ struct pci_bus * pci_create_bus(struct d
+@@ -1582,8 +1584,20 @@ struct pci_bus * pci_create_bus(struct d
pci_create_legacy_files(b);
b->number = b->secondary = bus;
@@ -2112,7 +2112,7 @@
return b;
-@@ -1594,18 +1608,58 @@ err_out:
+@@ -1599,18 +1613,58 @@ err_out:
return NULL;
}