From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adrian Bunk <bunk@kernel.org>
Subject: [2.6 patch] linux/init.h: simplify __mem{init,exit}* dependencies
Date: Fri, 2 Nov 2007 16:42:58 +0100
Message-ID: <20071102154258.GH30287@stusta.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Return-path: <linux-kernel-owner+glk-linux-kernel-3=40m.gmane.org-S1758213AbXKBPni@vger.kernel.org>
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
To: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: linux-acpi@vger.kernel.org

This patch simplifies the dependencies on __mem{init,exit}*
(ACPI_HOTPLUG_MEMORY requires MEMORY_HOTPLUG).

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
7f058c09288450736c541f6a5d043abd86d0c3bb 
diff --git a/include/linux/init.h b/include/linux/init.h
index 5141381..7dc5085 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -278,8 +278,7 @@ void __init parse_early_param(void);
 #define __cpuexitdata	__exitdata
 #endif
 
-#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
-	|| defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+#if defined(CONFIG_MEMORY_HOTPLUG)
 #define __meminit
 #define __meminitdata
 #define __memexit