diff options
| author | Valentina Manea <valentina.manea.m@gmail.com> | 2014-03-10 12:36:40 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-10 20:54:56 +0400 |
| commit | 9b6f0c4b98171f2a354e1e461fefa90ec2baafa6 (patch) | |
| tree | 33101906d35bc425e78ba6df8c6db18f9a371db1 /drivers/usb/core/usb.h | |
| parent | 04f7bb9d36d46ac25e2ec9d3a92252585a942385 (diff) | |
| download | linux-9b6f0c4b98171f2a354e1e461fefa90ec2baafa6.tar.xz | |
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/usb.h')
| -rw-r--r-- | drivers/usb/core/usb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 222bbd2618f1..a87532845bf9 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -2,7 +2,7 @@ #include <linux/acpi.h> struct usb_hub_descriptor; -struct dev_state; +struct usb_dev_state; /* Functions local to drivers/usb/core/ */ @@ -58,7 +58,7 @@ extern void usb_forced_unbind_intf(struct usb_interface *intf); extern void usb_rebind_intf(struct usb_interface *intf); extern void usb_hub_release_all_ports(struct usb_device *hdev, - struct dev_state *owner); + struct usb_dev_state *owner); extern bool usb_device_is_owned(struct usb_device *udev); extern int usb_hub_init(void); |