diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
| commit | 98793265b429a3f0b3f1750e74d67cd4d740d162 (patch) | |
| tree | b0bd717673f0c21845cf053f3fb6b75d42530af5 /drivers/usb/serial/ftdi_sio_ids.h | |
| parent | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (diff) | |
| parent | bd1b2a555952d959f47169056fca05acf7eff81f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...
Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
Diffstat (limited to 'drivers/usb/serial/ftdi_sio_ids.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 055b64ef0bba..df1d7da933ec 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters. | 2 | * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters. |
| 3 | * Please keep numerically sorted within individual areas, thanks! | 3 | * Please keep numerically sorted within individual areas, thanks! |
| 4 | * | 4 | * |
| 5 | * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais | 5 | * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais |
| 6 | * from Rudolf Gugler | 6 | * from Rudolf Gugler |
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| @@ -78,7 +78,7 @@ | |||
| 78 | */ | 78 | */ |
| 79 | #define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */ | 79 | #define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */ |
| 80 | 80 | ||
| 81 | /* www.starting-point-systems.com µChameleon device */ | 81 | /* www.starting-point-systems.com µChameleon device */ |
| 82 | #define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ | 82 | #define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ |
| 83 | 83 | ||
| 84 | /* | 84 | /* |
| @@ -291,7 +291,7 @@ | |||
| 291 | 291 | ||
| 292 | /* | 292 | /* |
| 293 | * Teratronik product ids. | 293 | * Teratronik product ids. |
| 294 | * Submitted by O. Wölfelschneider. | 294 | * Submitted by O. Wölfelschneider. |
| 295 | */ | 295 | */ |
| 296 | #define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ | 296 | #define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ |
| 297 | #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ | 297 | #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ |