diff options
author | 2008-07-16 11:07:59 +1000 | |
---|---|---|
committer | 2008-07-16 11:07:59 +1000 | |
commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /drivers/usb/misc/isight_firmware.c | |
parent | Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build (diff) | |
parent | Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
download | linux-dev-84c3d4aaec3338201b449034beac41635866bddf.tar.xz linux-dev-84c3d4aaec3338201b449034beac41635866bddf.zip |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'drivers/usb/misc/isight_firmware.c')
-rw-r--r-- | drivers/usb/misc/isight_firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index 9f30aa1f8a5d..d94aa7387608 100644 --- 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; |