From ece59495a04828f1f3348fef2a218446dc4c03d7 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Thu, 24 Jan 2008 22:20:18 +0100
Subject: [PATCH] --- yaml --- r: 78002 b: refs/heads/master c:
 1a3fb6d481689d0482eacadcbe3205b49b423c11 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/include/asm-generic/vmlinux.lds.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 06375179ff92..bc12cf5b6a02 100644
--- 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
index e0a56fb8f813..294853053707 100644
--- 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