This patch simplifies the dependencies on __mem{init,exit}* (ACPI_HOTPLUG_MEMORY requires MEMORY_HOTPLUG). Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> --- 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-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html