summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-10 13:31:04 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-10 18:55:32 +0200
commit31ac409a7921da39cc998f2432afa13e77fd8705 (patch)
tree1065fc1b963c95e75683ea6c661e2e6ee3958e51 /arch/x86/pci
parent22d5c67c5b0476e463ce4b632ba9ec3953d33a5f (diff)
downloadblackbird-op-linux-31ac409a7921da39cc998f2432afa13e77fd8705.tar.gz
blackbird-op-linux-31ac409a7921da39cc998f2432afa13e77fd8705.zip
x86, VisWS: turn into generic arch, add early init quirks
add early init quirks for VisWS. This gradually turns the VISWS subarch into a generic PC architecture. Signed-off-by: Ingo Molnar <mingo@elte.hu>
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
# Careful: VISWS overrule the pci-y above. The colons are
# therefor correct. This needs a proper fix by distangling the code.
-#pci-$(CONFIG_X86_VISWS) := visws.o irq.o fixup.o
+pci-$(CONFIG_X86_VISWS) += visws.o
pci-$(CONFIG_X86_NUMAQ) += numa.o
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)
static __init int pci_subsys_init(void)
{
+ return -1;
+
pci_visws_init();
pcibios_init();
+
+ return 0;
}
subsys_initcall(pci_subsys_init);
OpenPOWER on IntegriCloud