Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b5ea060f1e19c6a3f409d3472c723da4517547b8
Commit: b5ea060f1e19c6a3f409d3472c723da4517547b8
Parent: 732bb9ee8195053a7dc00b9eec7be48891ad8668
Author: Greg Kroah-Hartman <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 22:44:27 2007 -0600
Committer: Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Oct 12 14:55:08 2007 -0700
USB: rename choose_configuration
As it is global, give it a usb specific name in the global namespace.
Cc: Inaky Perez-Gonzalez <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
drivers/usb/core/generic.c | 4 ++--
drivers/usb/core/hub.c | 2 +-
drivers/usb/core/usb.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 7b9e1ec..9148b69 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -40,7 +40,7 @@ static int is_activesync(struct usb_interface_descriptor
*desc)
&& desc->bInterfaceProtocol == 1;
}
-int choose_configuration(struct usb_device *udev)
+int usb_choose_configuration(struct usb_device *udev)
{
int i;
int num_configs;
@@ -164,7 +164,7 @@ static int generic_probe(struct usb_device *udev)
if (udev->authorized == 0)
dev_err(&udev->dev, "Device is not authorized for usage\n");
else {
- c = choose_configuration(udev);
+ c = usb_choose_configuration(udev);
if (c >= 0) {
err = usb_set_configuration(udev, c);
if (err) {
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index f725d9e..4c495c4 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1460,7 +1460,7 @@ int usb_authorize_device(struct usb_device *usb_dev)
/* Choose and set the configuration. This registers the interfaces
* with the driver core and lets interface drivers bind to them.
*/
- c = choose_configuration(usb_dev);
+ c = usb_choose_configuration(usb_dev);
if (c >= 0) {
result = usb_set_configuration(usb_dev, c);
if (result) {
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index e22ec7f..c52626c 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,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
