Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 935699b..ff9a9f8 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -15,12 +15,11 @@
 #ifndef _LINUX_MEMORY_H_
 #define _LINUX_MEMORY_H_
 
-#include <linux/sysdev.h>
 #include <linux/node.h>
 #include <linux/compiler.h>
 #include <linux/mutex.h>
 
-#define MIN_MEMORY_BLOCK_SIZE     (1 << SECTION_SIZE_BITS)
+#define MIN_MEMORY_BLOCK_SIZE     (1UL << SECTION_SIZE_BITS)
 
 struct memory_block {
        unsigned long start_section_nr;
@@ -38,7 +37,7 @@ struct memory_block {
        int phys_device;                /* to which fru does this belong? */
        void *hw;                       /* optional pointer to fw/hw data */
        int (*phys_callback)(struct memory_block *);
-       struct sys_device sysdev;
+       struct device dev;
 };
 
 int arch_get_memory_phys_device(unsigned long start_pfn);