X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Flinux%2Fmemory.h;h=654ef55448780905fbdfb31d7eda298afb805b97;hb=5886269962f94fa9185c32db3ec936c612503235;hp=e251dc43d0f5ab8faee980ade3cbc3780db499ea;hpb=0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3;p=powerpc.git

diff --git a/include/linux/memory.h b/include/linux/memory.h
index e251dc43d0..654ef55448 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -57,7 +57,7 @@ struct memory_block {
 struct notifier_block;
 struct mem_section;
 
-#ifndef CONFIG_MEMORY_HOTPLUG
+#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE
 static inline int memory_dev_init(void)
 {
 	return 0;
@@ -77,9 +77,8 @@ extern int remove_memory_block(unsigned long, struct mem_section *, int);
 
 #define CONFIG_MEM_BLOCK_SIZE	(PAGES_PER_SECTION<<PAGE_SHIFT)
 
-struct notifier_block;
 
-#endif /* CONFIG_MEMORY_HOTPLUG */
+#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
 
 #define hotplug_memory_notifier(fn, pri) {			\
 	static struct notifier_block fn##_mem_nb =		\