diff options
author | 2006-01-04 16:34:57 -0800 | |
---|---|---|
committer | 2006-01-04 16:34:57 -0800 | |
commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /drivers/usb/serial | |
parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
parent | Documentation/filesystems/00-INDEX: remove entry for fat_cvf.txt (diff) | |
download | linux-dev-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.xz linux-dev-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index f380f9eaff71..00d45f8600de 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -727,7 +727,7 @@ typedef enum { */ /* FTDI_SIO_GET_MODEM_STATUS */ -/* Retreive the current value of the modem status register */ +/* Retrieve the current value of the modem status register */ #define FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE 0xc0 #define FTDI_SIO_GET_MODEM_STATUS_REQUEST FTDI_SIO_GET_MODEM_STATUS |