summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/usb.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-08-02 22:44:27 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 14:55:08 -0700
commitb5ea060f1e19c6a3f409d3472c723da4517547b8 (patch)
tree76e9647f3e36d0d6e28e9dec19d372119fa373f4 /drivers/usb/core/usb.h
parent732bb9ee8195053a7dc00b9eec7be48891ad8668 (diff)
downloadlinux-b5ea060f1e19c6a3f409d3472c723da4517547b8.tar.gz
linux-b5ea060f1e19c6a3f409d3472c723da4517547b8.tar.bz2
linux-b5ea060f1e19c6a3f409d3472c723da4517547b8.zip
USB: rename choose_configuration
As it is global, give it a usb specific name in the global namespace. Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r--drivers/usb/core/usb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index e22ec7f8eb15..c52626c51f70 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -23,7 +23,7 @@ extern int usb_get_device_descriptor(struct usb_device *dev,
unsigned int size);
extern char *usb_cache_string(struct usb_device *udev, int index);
extern int usb_set_configuration(struct usb_device *dev, int configuration);
-extern int choose_configuration(struct usb_device *udev);
+extern int usb_choose_configuration(struct usb_device *udev);
extern void usb_kick_khubd(struct usb_device *dev);
extern int usb_match_device(struct usb_device *dev,