diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:50:54 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:50:54 +0000 |
commit | 23578461a92aca344eb5d34d59352da3163281a8 (patch) | |
tree | 7884a0e5485ce8383b2b63163b38e40ea60ffb3c /target/linux/brcm47xx/patches-3.2/000-pci-backport.patch | |
parent | d52ae4d7d3a8335fb68ebaf53ad52e8586e8e29b (diff) | |
download | master-187ad058-23578461a92aca344eb5d34d59352da3163281a8.tar.gz master-187ad058-23578461a92aca344eb5d34d59352da3163281a8.tar.bz2 master-187ad058-23578461a92aca344eb5d34d59352da3163281a8.zip |
kernel: update linux 3.2 to 3.2.15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/000-pci-backport.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.2/000-pci-backport.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/000-pci-backport.patch b/target/linux/brcm47xx/patches-3.2/000-pci-backport.patch index b1eed44d6f..ecedbccf02 100644 --- a/target/linux/brcm47xx/patches-3.2/000-pci-backport.patch +++ b/target/linux/brcm47xx/patches-3.2/000-pci-backport.patch @@ -1358,7 +1358,7 @@ int busnum; }; -@@ -275,23 +275,20 @@ static void add_resources(struct pci_roo +@@ -285,23 +285,20 @@ static void add_resources(struct pci_roo "ignoring host bridge window %pR (conflicts with %s %pR)\n", res, conflict->name, conflict); else @@ -1385,7 +1385,7 @@ acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource, &info); if (!info.res_num) -@@ -300,7 +297,7 @@ get_current_resources(struct acpi_device +@@ -310,7 +307,7 @@ get_current_resources(struct acpi_device size = sizeof(*info.res) * info.res_num; info.res = kmalloc(size, GFP_KERNEL); if (!info.res) @@ -1394,7 +1394,7 @@ info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum); if (!info.name) -@@ -315,8 +312,6 @@ get_current_resources(struct acpi_device +@@ -325,8 +322,6 @@ get_current_resources(struct acpi_device name_alloc_fail: kfree(info.res); @@ -1403,7 +1403,7 @@ } struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) -@@ -324,6 +319,7 @@ struct pci_bus * __devinit pci_acpi_scan +@@ -334,6 +329,7 @@ struct pci_bus * __devinit pci_acpi_scan struct acpi_device *device = root->device; int domain = root->segment; int busnum = root->secondary.start; @@ -1411,7 +1411,7 @@ struct pci_bus *bus; struct pci_sysdata *sd; int node; -@@ -378,11 +374,15 @@ struct pci_bus * __devinit pci_acpi_scan +@@ -388,11 +384,15 @@ struct pci_bus * __devinit pci_acpi_scan memcpy(bus->sysdata, sd, sizeof(*sd)); kfree(sd); } else { |