Merge bk://ldm.bkbits.net/linux-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

1 files changed, 7 insertions, 1 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 21f789350502..ea2a790723b3 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -65,7 +65,8 @@ struct bus_type {
 	struct driver_dir_entry	device_dir;
 	struct driver_dir_entry	driver_dir;
 
-	int	(*match)	(struct device * dev, struct device_driver * drv);
+	int		(*match)(struct device * dev, struct device_driver * drv);
+	struct device * (*add)	(struct device * parent, char * bus_id);
 };
 
 
@@ -281,6 +282,8 @@ struct device {
 	void		*driver_data;	/* data private to the driver */
 
 	u32		class_num;	/* class-enumerated value */
+	void		* class_data;	/* class-specific data */
+
 	void		*platform_data;	/* Platform specific data (e.g. ACPI,
 					   BIOS data relevant to device) */
 
@@ -378,6 +381,9 @@ extern void put_device(struct device * dev);
 extern int register_sys_device(struct device * dev);
 extern void unregister_sys_device(struct device * dev);
 
+/* drivers/base/platform.c */
+extern struct bus_type platform_bus;
+
 /* drivers/base/power.c */
 extern int device_suspend(u32 state, u32 level);
 extern void device_resume(u32 level);