mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: update linux 3.2 to 3.2.15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31335 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user