Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-sync

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-linus

1 files changed, 8 insertions, 1 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 2ad1e9ff4f75..dd88f8b7cace 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -54,7 +54,7 @@ enum {
 };
 
 struct device;
-
+struct device_driver;
 
 struct bus_type {
 	char			* name;
@@ -68,6 +68,8 @@ struct bus_type {
 	struct driver_dir_entry	dir;
 	struct driver_dir_entry	device_dir;
 	struct driver_dir_entry	driver_dir;
+
+	int	(*bind)		(struct device * dev, struct device_driver * drv);
 };
 
 
@@ -82,6 +84,11 @@ static inline struct bus_type * get_bus(struct bus_type * bus)
 
 extern void put_bus(struct bus_type * bus);
 
+extern int bus_for_each_dev(struct bus_type * bus, void * data, 
+			    int (*callback)(struct device * dev, void * data));
+extern int bus_for_each_drv(struct bus_type * bus, void * data,
+			    int (*callback)(struct device_driver * drv, void * data));
+
 
 struct device_driver {
 	char			* name;