Merge branch 'linus' into sched/core

[mv-sheeva.git] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 1adfe779eb99123a91c4141bd1974654db8d5880..85582e1bcee900bd219c60169a708a2a38dca8e1 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -36,6 +36,8 @@ struct memory_block {
        struct sys_device sysdev;
 };
 
+int arch_get_memory_phys_device(unsigned long start_pfn);
+
 /* These states are exposed to userspace as text strings in sysfs */
 #define        MEM_ONLINE              (1<<0) /* exposed to userspace */
 #define        MEM_GOING_OFFLINE       (1<<1) /* exposed to userspace */