aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-02 16:49:37 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-02 16:49:37 -0700
commit27fb4f0a7f00fda4044de44dcbe4d65b8359cc38 (patch)
tree71e98948bbadc5cb9237824377e48d7098a950a7 /include/linux/usb.h
parentUSB: UHCI: Don't test the Short Packet Detect bit (diff)
downloadlinux-dev-27fb4f0a7f00fda4044de44dcbe4d65b8359cc38.tar.xz
linux-dev-27fb4f0a7f00fda4044de44dcbe4d65b8359cc38.zip
Revert "[PATCH] USB: convert usb class devices to real devices"
This reverts bd00949647ddcea47ce4ea8bb2cfcfc98ebf9f2a commit because it required a newer version of udev to work properly than what is currently documented in Documentation/Changes. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r--include/linux/usb.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index c944e8f06a4a..398c52f37679 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -103,8 +103,7 @@ enum usb_interface_condition {
* @condition: binding state of the interface: not bound, binding
* (in probe()), bound to a driver, or unbinding (in disconnect())
* @dev: driver model's view of this device
- * @usb_dev: if an interface is bound to the USB major, this will point
- * to the sysfs representation for that device.
+ * @class_dev: driver model's class view of this device.
*
* USB device drivers attach to interfaces on a physical device. Each
* interface encapsulates a single high level function, such as feeding
@@ -144,7 +143,7 @@ struct usb_interface {
* bound to */
enum usb_interface_condition condition; /* state of binding */
struct device dev; /* interface specific device info */
- struct device *usb_dev; /* pointer to the usb class's device, if any */
+ struct class_device *class_dev;
};
#define to_usb_interface(d) container_of(d, struct usb_interface, dev)
#define interface_to_usbdev(intf) \