Merge branch 'upstream' into for-linus

[mv-sheeva.git] / drivers / staging / comedi / drivers / dt9812.c

diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 312f4f282bd7671c35f6465fd035c2d2090a7c2f..96caae36279c6a642441b47a0a3aa7bf3310d877 100644 (file)
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -264,7 +264,7 @@ struct dt9812_usb_cmd {
 
 static DECLARE_MUTEX(dt9812_mutex);
 
-static struct usb_device_id dt9812_table[] = {
+static const struct usb_device_id dt9812_table[] = {
        {USB_DEVICE(0x0867, 0x9812)},
        {}                      /* Terminating entry */
 };