diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-22 12:05:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-22 12:05:48 -0400 |
| commit | 2fb20b61550d3c5335e59819ed22734900d4d6e3 (patch) | |
| tree | 5ac7690306a0230b51e79afe5cfd3e6575b98cb1 /drivers/usb/class/usbtmc.c | |
| parent | 23caaf19b11eda7054348452e1618d4512a86907 (diff) | |
| parent | 6da7a2aa899f75116e1a62cef78c358ada9878b7 (diff) | |
Merge branch 'topic/misc' into topic/usb
Diffstat (limited to 'drivers/usb/class/usbtmc.c')
| -rw-r--r-- | drivers/usb/class/usbtmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 7c5f4e32c920..8588c0937a89 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | */ | 48 | */ |
| 49 | #define USBTMC_MAX_READS_TO_CLEAR_BULK_IN 100 | 49 | #define USBTMC_MAX_READS_TO_CLEAR_BULK_IN 100 |
| 50 | 50 | ||
| 51 | static struct usb_device_id usbtmc_devices[] = { | 51 | static const struct usb_device_id usbtmc_devices[] = { |
| 52 | { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), }, | 52 | { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), }, |
| 53 | { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 1), }, | 53 | { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 1), }, |
| 54 | { 0, } /* terminating entry */ | 54 | { 0, } /* terminating entry */ |