diff --git a/[refs] b/[refs]
index 7e632a05f671..7f8e6ad0a988 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 471b3c1b011f807d16f1e19d1d4ecf703f1e7d1a
+refs/heads/master: 4e78c91abe1a40b905611100a593be62784ba355
diff --git a/trunk/arch/x86/kernel/numaq_32.c b/trunk/arch/x86/kernel/numaq_32.c
index 992f53cb79b6..e65281b1634b 100644
--- a/trunk/arch/x86/kernel/numaq_32.c
+++ b/trunk/arch/x86/kernel/numaq_32.c
@@ -87,14 +87,3 @@ 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