diff options
| author |   Valentina Manea <valentina.manea.m@gmail.com> | 2014-03-10 10:36:40 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-10 09:54:56 -0700 |
| commit | 9b6f0c4b98171f2a354e1e461fefa90ec2baafa6 (patch) | |
| tree | 33101906d35bc425e78ba6df8c6db18f9a371db1 /drivers/usb/core/hub.h | |
| parent | staging: usbip: userspace: add hwdata as optional dependency in README (diff) | |
| download | linux-dev-9b6f0c4b98171f2a354e1e461fefa90ec2baafa6.tar.xz linux-dev-9b6f0c4b98171f2a354e1e461fefa90ec2baafa6.zip | |
usbcore: rename struct dev_state to struct usb_dev_state
Since it is needed outside usbcore and exposed in include/linux/usb.h,
it conflicts with enum dev_state in rt2x00 wireless driver.
Mark it as usb specific to avoid conflicts in the future.
Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/hub.h')
| -rw-r--r-- | drivers/usb/core/hub.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index df629a310e44..33bcb2c6f90a 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -89,7 +89,7 @@ struct usb_hub { struct usb_port { struct usb_device *child; struct device dev; - struct dev_state *port_owner; + struct usb_dev_state *port_owner; enum usb_port_connect_type connect_type; u8 portnum; unsigned power_is_on:1; |