summaryrefslogtreecommitdiff
path: root/include/linux/usb.h
diff options
context:
space:
mode:
authorValentina Manea <valentina.manea.m@gmail.com>2014-03-10 12:36:40 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-10 20:54:56 +0400
commit9b6f0c4b98171f2a354e1e461fefa90ec2baafa6 (patch)
tree33101906d35bc425e78ba6df8c6db18f9a371db1 /include/linux/usb.h
parent04f7bb9d36d46ac25e2ec9d3a92252585a942385 (diff)
downloadlinux-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 'include/linux/usb.h')
-rw-r--r--include/linux/usb.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 140a6a3e7d56..b55600a1edc3 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -366,7 +366,7 @@ struct usb_bus {
#endif
};
-struct dev_state;
+struct usb_dev_state;
/* ----------------------------------------------------------------------- */
@@ -753,9 +753,9 @@ extern struct usb_host_interface *usb_find_alt_setting(
/* port claiming functions */
int usb_hub_claim_port(struct usb_device *hdev, unsigned port1,
- struct dev_state *owner);
+ struct usb_dev_state *owner);
int usb_hub_release_port(struct usb_device *hdev, unsigned port1,
- struct dev_state *owner);
+ struct usb_dev_state *owner);
/**
* usb_make_path - returns stable device path in the usb tree