From: Adrian Bunk <bunk@stusta.de>
Date: Thu, 20 Apr 2006 09:43:23 +0000 (-0700)
Subject: [PATCH] memory_hotplug.h cleanup
X-Git-Tag: v2.6.17-rc3~65
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=72b38d436e4cd18185de11f4b48a6e62eb104644;p=safe%2Fjmp%2Flinux-2.6

[PATCH] memory_hotplug.h cleanup

We don't have to #if guard prototypes.

This also fixes a bug observed by Randy Dunlap due to a misspelled
option in the #if.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 4ca3e6a..9112063 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -99,10 +99,7 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
 	return -ENOSYS;
 }
 
-#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
-	|| defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
 extern int add_memory(u64 start, u64 size);
 extern int remove_memory(u64 start, u64 size);
-#endif
 
 #endif /* __LINUX_MEMORY_HOTPLUG_H */