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 branch 'devel' into next
[pandora-kernel.git]
/
arch
/
x86
/
pci
/
legacy.c
diff --git
a/arch/x86/pci/legacy.c
b/arch/x86/pci/legacy.c
index
a67921c
..
132876c
100644
(file)
--- a/
arch/x86/pci/legacy.c
+++ b/
arch/x86/pci/legacy.c
@@
-55,4
+55,18
@@
static int __init pci_legacy_init(void)
return 0;
}
return 0;
}
-subsys_initcall(pci_legacy_init);
+int __init pci_subsys_init(void)
+{
+#ifdef CONFIG_ACPI
+ pci_acpi_init();
+#endif
+ pci_legacy_init();
+ pcibios_irq_init();
+#ifdef CONFIG_X86_NUMAQ
+ pci_numa_init();
+#endif
+ pcibios_init();
+
+ return 0;
+}
+subsys_initcall(pci_subsys_init);