[2.6 patch] linux/init.h: simplify __mem{init,exit}* dependencies

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

Signed-off-by: Adrian Bunk <[email protected]>

---
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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Prev by Date: [PATCH 6/6] UML - get_wchan fixes
• Next by Date: Re: build failure, missing libvdeplug.h?
• Previous by thread: [PATCH 6/6] UML - get_wchan fixes
• Next by thread: [2.6 patch] lguest: make async_hcall() static
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]