diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-04-20 05:43:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-20 10:54:04 -0400 |
| commit | 72b38d436e4cd18185de11f4b48a6e62eb104644 (patch) | |
| tree | cbb24dbe93ca265c4161eaa0b24854edcd88a8c5 | |
| parent | 46539264df5b1fcdc2cad585b032a86661fe079d (diff) | |
[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>
| -rw-r--r-- | include/linux/memory_hotplug.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 4ca3e6ad03ec..911206386171 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, | |||
| 99 | return -ENOSYS; | 99 | return -ENOSYS; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | #if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \ | ||
| 103 | || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE) | ||
| 104 | extern int add_memory(u64 start, u64 size); | 102 | extern int add_memory(u64 start, u64 size); |
| 105 | extern int remove_memory(u64 start, u64 size); | 103 | extern int remove_memory(u64 start, u64 size); |
| 106 | #endif | ||
| 107 | 104 | ||
| 108 | #endif /* __LINUX_MEMORY_HOTPLUG_H */ | 105 | #endif /* __LINUX_MEMORY_HOTPLUG_H */ |