diff options
| author | Greg Kroah-Hartman | 2007-08-03 06:44:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2007-10-12 23:55:08 +0200 |
| commit | b5ea060f1e19c6a3f409d3472c723da4517547b8 (patch) | |
| tree | 76e9647f3e36d0d6e28e9dec19d372119fa373f4 /drivers/usb/core/generic.c | |
| parent | usb: document device authorization (diff) | |
| download | kernel-qcow2-linux-b5ea060f1e19c6a3f409d3472c723da4517547b8.tar.gz kernel-qcow2-linux-b5ea060f1e19c6a3f409d3472c723da4517547b8.tar.xz kernel-qcow2-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/generic.c')
| -rw-r--r-- | drivers/usb/core/generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index 7b9e1ec718d2..9148b69785c5 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) { |