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