Merge ../linux-2.6

[linux-2.6] / drivers / usb / misc / isight_firmware.c

diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c
index 9f30aa1f8a5da5cdba326d67a80d8a2bf30cb01e..d94aa7387608fde3db0e3690eea050980bc0b5df 100644 (file)
--- a/drivers/usb/misc/isight_firmware.c
+++ b/drivers/usb/misc/isight_firmware.c
@@ -41,7 +41,7 @@ static int isight_firmware_load(struct usb_interface *intf,
        const struct firmware *firmware;
        unsigned char *buf = kmalloc(50, GFP_KERNEL);
        unsigned char data[4];
-       u8 *ptr;
+       const u8 *ptr;
 
        if (!buf)
                return -ENOMEM;