diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-04-20 11:43:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-20 16:54:04 +0200 |
| commit | 72b38d436e4cd18185de11f4b48a6e62eb104644 (patch) | |
| tree | cbb24dbe93ca265c4161eaa0b24854edcd88a8c5 /include | |
| parent | [PATCH] make the OSS SOUND_VIA82CXXX option available again (diff) | |
| download | linux-72b38d436e4cd18185de11f4b48a6e62eb104644.tar.xz linux-72b38d436e4cd18185de11f4b48a6e62eb104644.zip | |
[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>
Diffstat (limited to 'include')
| -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, 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 */ |