---

yaml --- r: 344052 b: refs/heads/master c: 3dfd823 h: refs/heads/master v: v3
git-mirror · Oct 2, 2012 · 0192685 · 0192685
1 parent f8d9b27
commit 0192685
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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();