Merge master.kernel.org:/home/mochel/BK/linux-2.5

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

2 files changed, 2 insertions, 23 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 1e4ad15085b8..f8234fdff19f 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -54,14 +54,13 @@ enum {
 };
 
 struct device;
-struct iobus;
 
 struct device_driver {
 	int	(*probe)	(struct device * dev);
 	int 	(*remove)	(struct device * dev, u32 flags);
 
-	int	(*suspend)	(struct device * dev, u32 state, u32 stage);
-	int	(*resume)	(struct device * dev, u32 stage);
+	int	(*suspend)	(struct device * dev, u32 state, u32 level);
+	int	(*resume)	(struct device * dev, u32 level);
 };
 
 struct device {
@@ -94,23 +93,6 @@ struct device {
 	unsigned char *saved_state;	/* saved device state */
 };
 
-/*
- * struct bus_type - descriptor for a type of bus
- * There are some instances when you need to know what type of bus a
- * device is on. Instead of having some sort of enumerated integer type,
- * each struct iobus will have a pointer to a struct bus_type that gives
- * actually meaningful data.
- * There should be one struct bus_type for each type of bus (one for PCI,
- * one for USB, etc).
- */
-struct iobus_driver {
-	char	name[16];	/* ascii descriptor of type of bus */
-	struct	list_head node; /* node in global list of bus drivers */
-
-	int	(*scan)		(struct iobus*);
-	int	(*add_device)	(struct iobus*, char*);
-};
-
 static inline struct device *
 list_to_dev(struct list_head *node)
 {
@@ -122,8 +104,6 @@ list_to_dev(struct list_head *node)
  */
 extern int device_register(struct device * dev);
 
-extern int iobus_register(struct iobus * iobus);
-
 extern int device_create_file(struct device *device, struct driver_file_entry * entry);
 extern void device_remove_file(struct device * dev, const char * name);
 
diff --git a/include/linux/driverfs_fs.h b/include/linux/driverfs_fs.h
index 8141302ef67d..48a773dcfb9a 100644
--- a/include/linux/driverfs_fs.h
+++ b/include/linux/driverfs_fs.h
@@ -41,7 +41,6 @@ struct driver_file_entry {
 	char			* name;
 	mode_t			mode;
 	struct dentry		* dentry;
-	void			* data;
 
 	ssize_t (*show)(struct device * dev, char * buf, size_t count, loff_t off);
 	ssize_t (*store)(struct device * dev, const char * buf, size_t count, loff_t off);