git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
acpi
/
pci_root.c
diff --git
a/drivers/acpi/pci_root.c
b/drivers/acpi/pci_root.c
index
f14ff1f
..
c3fed31
100644
(file)
--- a/
drivers/acpi/pci_root.c
+++ b/
drivers/acpi/pci_root.c
@@
-184,7
+184,7
@@
static void acpi_pci_bridge_scan(struct acpi_device *device)
}
}
-static int acpi_pci_root_add(struct acpi_device *device)
+static int
__devinit
acpi_pci_root_add(struct acpi_device *device)
{
int result = 0;
struct acpi_pci_root *root = NULL;