summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/usb.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-25 12:12:17 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-25 12:12:17 +0100
commitd01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch)
tree4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /drivers/usb/core/usb.h
parentbf68665d7a5647591258c120382fd64465db7d63 (diff)
parent37c367ecdb9a01c9acc980e6e17913570a1788a7 (diff)
downloadlinux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.bz2
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r--drivers/usb/core/usb.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index c49383669cd8..823857767a16 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -35,7 +35,6 @@ extern int usb_get_device_descriptor(struct usb_device *dev,
unsigned int size);
extern int usb_get_bos_descriptor(struct usb_device *dev);
extern void usb_release_bos_descriptor(struct usb_device *dev);
-extern int usb_device_supports_lpm(struct usb_device *udev);
extern char *usb_cache_string(struct usb_device *udev, int index);
extern int usb_set_configuration(struct usb_device *dev, int configuration);
extern int usb_choose_configuration(struct usb_device *udev);