summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-03 10:16:10 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-03 10:24:01 +0200
commitf3294690979634ee10398bb0beadfe1d4edb881d (patch)
tree006dbc4a887b4bd12c58c4f8c7e7afb2e246ba34
parentb28852d6703e4b72ce363c5168ea8d3fb28b9c57 (diff)
downloadtalos-op-linux-f3294690979634ee10398bb0beadfe1d4edb881d.tar.gz
talos-op-linux-f3294690979634ee10398bb0beadfe1d4edb881d.zip
x86, numaq: add pci_acpi_scan_root() stub
allow 32-bit numaq build to succeed with ACPI enabled.
-rw-r--r--arch/x86/kernel/numaq_32.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index e65281b1634b..992f53cb79b6 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -87,3 +87,14 @@ static int __init numaq_tsc_disable(void)
return 0;
}
arch_initcall(numaq_tsc_disable);
+
+#ifdef CONFIG_ACPI
+/*
+ * Dummy implementation:
+ */
+struct pci_bus * __devinit
+pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
+{
+ return NULL;
+}
+#endif
OpenPOWER on IntegriCloud