From 353710975430a18494f6ef096f7c2fddd3a97436 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 3 Jun 2008 10:16:10 +0200
Subject: [PATCH] --- yaml --- r: 99311 b: refs/heads/master c:
 f3294690979634ee10398bb0beadfe1d4edb881d h: refs/heads/master i:   99309:
 089309f230fd9ac52728d359052ab9dcc3859a31   99307:
 30af18d7d5db0f742489bd53241c2b758b133a28   99303:
 1c008ce9941617861a71c6d40d27b04a9237580f   99295:
 942b2324ffeca7237f140ed5d01336830476e56d v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kernel/numaq_32.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f67ed3200c4..c52a5f46eaf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b28852d6703e4b72ce363c5168ea8d3fb28b9c57
+refs/heads/master: f3294690979634ee10398bb0beadfe1d4edb881d
diff --git a/trunk/arch/x86/kernel/numaq_32.c b/trunk/arch/x86/kernel/numaq_32.c
index e65281b1634b..992f53cb79b6 100644
--- a/trunk/arch/x86/kernel/numaq_32.c
+++ b/trunk/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