Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index ef0b35731ff0..83e815d3cd52 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -239,7 +239,7 @@ static char *usb_dump_interface_descriptor(char *start, char *end,
         int setno)
 {
         const struct usb_interface_descriptor *desc = &intfc->altsetting[setno].desc;
-        char *driver_name = "";
+        const char *driver_name = "";
 
         if (start > end)
                 return start;