Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 0def328ab5cfbae5fc44a769f8bc30f5257a5b85..9a424383e6c60064fdb76ae8b0c7895351da69a0 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -54,6 +54,9 @@ struct memory_block {
  */
 #define        MEM_MAPPING_INVALID     (1<<3)
 
+struct notifier_block;
+struct mem_section;
+
 #ifndef CONFIG_MEMORY_HOTPLUG
 static inline int memory_dev_init(void)
 {