ChangeSet 1.897.1.1, 2003/01/07 21:29:37-08:00, [EMAIL PROTECTED]
Merge kroah.com:/home/linux/linux/BK/bleeding-2.5
into kroah.com:/home/linux/linux/BK/gregkh-2.5
diff -Nru a/include/linux/device.h b/include/linux/device.h
--- a/include/linux/device.h Wed Jan 8 11:55:39 2003
+++ b/include/linux/device.h Wed Jan 8 11:55:39 2003
@@ -66,10 +66,8 @@
char * name;
struct subsystem subsys;
- struct subsystem drvsubsys;
- struct subsystem devsubsys;
- struct list_head devices;
- struct list_head drivers;
+ struct kset drivers;
+ struct kset devices;
int (*match)(struct device * dev, struct device_driver * drv);
struct device * (*add) (struct device * parent, char * bus_id);
@@ -84,6 +82,7 @@
extern struct bus_type * get_bus(struct bus_type * bus);
extern void put_bus(struct bus_type * bus);
+extern struct bus_type * find_bus(char * name);
/* iterator helpers for buses */
@@ -119,7 +118,6 @@
struct semaphore unload_sem;
struct kobject kobj;
- struct list_head bus_list;
struct list_head class_list;
struct list_head devices;
@@ -165,10 +163,8 @@
u32 devnum;
struct subsystem subsys;
- struct subsystem devsubsys;
- struct subsystem drvsubsys;
- struct list_head drivers;
- struct list_head devices;
+ struct kset devices;
+ struct kset drivers;
int (*add_device)(struct device *);
void (*remove_device)(struct device *);
@@ -217,7 +213,7 @@
char * name;
struct device_class * devclass;
- struct subsystem subsys;
+ struct kset kset;
u32 devnum;
int (*add_device) (struct device *);
@@ -310,6 +306,14 @@
extern void device_initialize(struct device * dev);
extern int device_add(struct device * dev);
extern void device_del(struct device * dev);
+
+/*
+ * Manual binding of a device to driver. See drivers/base/bus.c
+ * for information on use.
+ */
+extern void device_bind_driver(struct device * dev);
+extern void device_release_driver(struct device * dev);
+
/* driverfs interface for exporting device attributes */
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
