Merge hera.kernel.org:/home/torvalds/BK/linux-2.5

into hera.kernel.org:/home/mochel/BK/linux-2.5

1 files changed, 16 insertions, 0 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index f8234fdff19f..b1858aa6a4ed 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -64,6 +64,7 @@ struct device_driver {
 };
 
 struct device {
+	struct list_head g_list;        /* node in depth-first order list */
 	struct list_head node;		/* node in sibling list */
 	struct list_head children;
 	struct device 	* parent;
@@ -99,6 +100,12 @@ list_to_dev(struct list_head *node)
 	return list_entry(node, struct device, node);
 }
 
+static inline struct device *
+g_list_to_dev(struct list_head *g_list)
+{
+	return list_entry(g_list, struct device, g_list);
+}
+
 /*
  * High level routines for use by the bus drivers
  */
@@ -143,4 +150,13 @@ static inline void get_device(struct device * dev)
 
 extern void put_device(struct device * dev);
 
+/* drivers/base/sys.c */
+extern int register_sys_device(struct device * dev);
+extern void unregister_sys_device(struct device * dev);
+
+/* drivers/base/power.c */
+extern int device_suspend(u32 state, u32 level);
+extern void device_resume(u32 level);
+extern void device_shutdown(void);
+
 #endif /* _DEVICE_H_ */