aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/Makefile2
-rw-r--r--arch/x86/pci/visws.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index fa0164d80bbd..c03c2094864f 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -11,7 +11,7 @@ pci-y += legacy.o irq.o
11 11
12# Careful: VISWS overrule the pci-y above. The colons are 12# Careful: VISWS overrule the pci-y above. The colons are
13# therefor correct. This needs a proper fix by distangling the code. 13# therefor correct. This needs a proper fix by distangling the code.
14#pci-$(CONFIG_X86_VISWS) := visws.o irq.o fixup.o 14pci-$(CONFIG_X86_VISWS) += visws.o
15 15
16pci-$(CONFIG_X86_NUMAQ) += numa.o 16pci-$(CONFIG_X86_NUMAQ) += numa.o
17 17
diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c
index 343ccf668d14..2e022210a632 100644
--- a/arch/x86/pci/visws.c
+++ b/arch/x86/pci/visws.c
@@ -107,7 +107,11 @@ static int __init pci_visws_init(void)
107 107
108static __init int pci_subsys_init(void) 108static __init int pci_subsys_init(void)
109{ 109{
110 return -1;
111
110 pci_visws_init(); 112 pci_visws_init();
111 pcibios_init(); 113 pcibios_init();
114
115 return 0;
112} 116}
113subsys_initcall(pci_subsys_init); 117subsys_initcall(pci_subsys_init);