diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /drivers/usb/image/mdc800.c | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'drivers/usb/image/mdc800.c')
| -rw-r--r-- | drivers/usb/image/mdc800.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c index eca355dccf65..e192e8f7c560 100644 --- a/drivers/usb/image/mdc800.c +++ b/drivers/usb/image/mdc800.c | |||
| @@ -967,7 +967,7 @@ static const struct file_operations mdc800_device_ops = | |||
| 967 | 967 | ||
| 968 | 968 | ||
| 969 | 969 | ||
| 970 | static struct usb_device_id mdc800_table [] = { | 970 | static const struct usb_device_id mdc800_table[] = { |
| 971 | { USB_DEVICE(MDC800_VENDOR_ID, MDC800_PRODUCT_ID) }, | 971 | { USB_DEVICE(MDC800_VENDOR_ID, MDC800_PRODUCT_ID) }, |
| 972 | { } /* Terminating entry */ | 972 | { } /* Terminating entry */ |
| 973 | }; | 973 | }; |