diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-07-24 13:20:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-07-24 13:20:19 +1000 |
| commit | 51f16a9e4c25b2b1ed5f552b911783c4eb83082e (patch) | |
| tree | f70819d68134041309922415594031a79ced1a1d | |
| parent | c267bfa38757f9a944593d612cb07896419873db (diff) | |
| parent | f4c126ecaef1c08a906a2af51fb538022906f101 (diff) | |
Merge remote-tracking branch 'usb-serial/usb-next'
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 792e054126de..cb12b319d008 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h @@ -1365,7 +1365,7 @@ #define FTDI_CTI_NANO_PID 0xF60B /* - * ZeitControl cardsystems GmbH rfid-readers http://zeitconrol.de + * ZeitControl cardsystems GmbH rfid-readers http://zeitcontrol.de */ /* TagTracer MIFARE*/ #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0 |