diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 07:24:22 -0500 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 07:26:51 -0500 |
| commit | 89d4a1753b6632327f18d6c8e0842b366b736621 (patch) | |
| tree | eb74be7a995d5b5b3f29f5c6794736a514109d80 /drivers/usb/serial/ftdi_sio_ids.h | |
| parent | 7eca30aef7961e68ad74c0ef920546c2be7f6579 (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6
Diffstat (limited to 'drivers/usb/serial/ftdi_sio_ids.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index f994503df2dd..6f6058f0db1b 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -1187,3 +1187,10 @@ | |||
| 1187 | */ | 1187 | */ |
| 1188 | /* ZigBee controller */ | 1188 | /* ZigBee controller */ |
| 1189 | #define FTDI_RF_R106 0x8A28 | 1189 | #define FTDI_RF_R106 0x8A28 |
| 1190 | |||
| 1191 | /* | ||
| 1192 | * Product: HCP HIT GPRS modem | ||
| 1193 | * Manufacturer: HCP d.o.o. | ||
| 1194 | * ATI command output: Cinterion MC55i | ||
| 1195 | */ | ||
| 1196 | #define FTDI_CINTERION_MC55I_PID 0xA951 | ||