[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>
This commit is contained in:
Adrian Bunk 2006-04-20 02:43:23 -07:00 committed by Linus Torvalds
parent 46539264df
commit 72b38d436e
1 changed files with 0 additions and 3 deletions

View File

@ -99,10 +99,7 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
return -ENOSYS; 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 add_memory(u64 start, u64 size);
extern int remove_memory(u64 start, u64 size); extern int remove_memory(u64 start, u64 size);
#endif
#endif /* __LINUX_MEMORY_HOTPLUG_H */ #endif /* __LINUX_MEMORY_HOTPLUG_H */