diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/serial/siemens_mpi.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/serial/siemens_mpi.c')
| -rw-r--r-- | drivers/usb/serial/siemens_mpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/siemens_mpi.c b/drivers/usb/serial/siemens_mpi.c index 951ea0c6ba77..cb8195cabfde 100644 --- a/drivers/usb/serial/siemens_mpi.c +++ b/drivers/usb/serial/siemens_mpi.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #define DRIVER_DESC "Driver for Siemens USB/MPI adapter" | 22 | #define DRIVER_DESC "Driver for Siemens USB/MPI adapter" |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | static struct usb_device_id id_table[] = { | 25 | static const struct usb_device_id id_table[] = { |
| 26 | /* Vendor and product id for 6ES7-972-0CB20-0XA0 */ | 26 | /* Vendor and product id for 6ES7-972-0CB20-0XA0 */ |
| 27 | { USB_DEVICE(0x908, 0x0004) }, | 27 | { USB_DEVICE(0x908, 0x0004) }, |
| 28 | { }, | 28 | { }, |