diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-19 17:21:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-19 17:21:00 +1100 |
| commit | db8bd287697a30fa47f9c447b0b549fd872d668d (patch) | |
| tree | 239f028b886c2723f6b0c3b49e819b6027a8d14b /drivers/staging/serqt_usb2 | |
| parent | 289ca863fd9bc749774e7a59c0f7af1a100b4e02 (diff) | |
| parent | 72bfbea9e8cff28b73f953aca69ab40d0a1a3486 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/serqt_usb2')
| -rw-r--r-- | drivers/staging/serqt_usb2/serqt_usb2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c index 060e9de3b065..375a50580a28 100644 --- a/drivers/staging/serqt_usb2/serqt_usb2.c +++ b/drivers/staging/serqt_usb2/serqt_usb2.c @@ -126,7 +126,7 @@ static int debug; #define MODEM_CTRL 0x40 #define RS232_MODE 0x00 -static struct usb_device_id serqt_id_table[] = { +static const struct usb_device_id serqt_id_table[] = { {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU100)}, {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU200)}, {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU100)}, |