Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery...

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

diff --git a/include/linux/node.h b/include/linux/node.h
index 92370e22343c9b76ced64f9cc42bde7c6bf559e0..624e53cecc0298a70b6393ff4a262ae0935af727 100644 (file)
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -14,12 +14,12 @@
 #ifndef _LINUX_NODE_H_
 #define _LINUX_NODE_H_
 
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/cpumask.h>
 #include <linux/workqueue.h>
 
 struct node {
-       struct sys_device       sysdev;
+       struct device   dev;
 
 #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS)
        struct work_struct      node_work;
@@ -80,6 +80,6 @@ static inline void register_hugetlbfs_with_node(node_registration_func_t reg,
 }
 #endif
 
-#define to_node(sys_device) container_of(sys_device, struct node, sysdev)
+#define to_node(device) container_of(device, struct node, dev)
 
 #endif /* _LINUX_NODE_H_ */