From 019268562cefad000d4d616ad86d203b5e57f6ef Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Mon, 1 Oct 2012 20:38:47 -0700
Subject: [PATCH] --- yaml --- r: 344052 b: refs/heads/master c:
 3dfd8235002727dbd759bb0f80f8ac862f392071 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f8bd04c7e9c2..7fac3d5952b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8347bbecf3518aa1518f6157e661812a35775130
+refs/heads/master: 3dfd8235002727dbd759bb0f80f8ac862f392071
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 764e543b2297..bf82c1e05464 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -941,7 +941,9 @@ void __init setup_arch(char **cmdline_p)
 
 	reserve_initrd();
 
+#if defined(CONFIG_ACPI) && defined(CONFIG_BLK_DEV_INITRD)
 	acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start);
+#endif
 
 	reserve_crashkernel();