---

yaml --- r: 78002 b: refs/heads/master c: 1a3fb6d h: refs/heads/master v: v3
git-mirror · Jan 28, 2008 · ece5949 · ece5949
1 parent 17bb6d7
commit ece5949
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ff6eecca4e5c49a5d1dd8b58ea0e20102ce08f0
+refs/heads/master: 1a3fb6d481689d0482eacadcbe3205b49b423c11
diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h
@@ -29,8 +29,7 @@
 #define CPU_DISCARD(sec) *(.cpu##sec)
 #endif
 
-#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
-	|| defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+#if defined(CONFIG_MEMORY_HOTPLUG)
 #define MEM_KEEP(sec)    *(.mem##sec)
 #define MEM_DISCARD(sec)
 #else