diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
| commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
| tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /drivers/usb | |
| parent | 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff) | |
| parent | 48d727a9f93e617d6d443507acf7d1b849c63366 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/class/usblp.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index 27e9404547f3..dba4cc026077 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1999 Michael Gee <michael@linuxspecific.com> | 4 | * Copyright (c) 1999 Michael Gee <michael@linuxspecific.com> |
| 5 | * Copyright (c) 1999 Pavel Machek <pavel@suse.cz> | 5 | * Copyright (c) 1999 Pavel Machek <pavel@suse.cz> |
| 6 | * Copyright (c) 2000 Randy Dunlap <rddunlap@osdl.org> | 6 | * Copyright (c) 2000 Randy Dunlap <rdunlap@xenotime.net> |
| 7 | * Copyright (c) 2000 Vojtech Pavlik <vojtech@suse.cz> | 7 | * Copyright (c) 2000 Vojtech Pavlik <vojtech@suse.cz> |
| 8 | # Copyright (c) 2001 Pete Zaitcev <zaitcev@redhat.com> | 8 | # Copyright (c) 2001 Pete Zaitcev <zaitcev@redhat.com> |
| 9 | # Copyright (c) 2001 David Paschal <paschal@rcsis.com> | 9 | # Copyright (c) 2001 David Paschal <paschal@rcsis.com> |
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 { | |||
| 727 | */ | 727 | */ |
| 728 | 728 | ||
| 729 | /* FTDI_SIO_GET_MODEM_STATUS */ | 729 | /* FTDI_SIO_GET_MODEM_STATUS */ |
| 730 | /* Retreive the current value of the modem status register */ | 730 | /* Retrieve the current value of the modem status register */ |
| 731 | 731 | ||
| 732 | #define FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE 0xc0 | 732 | #define FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE 0xc0 |
| 733 | #define FTDI_SIO_GET_MODEM_STATUS_REQUEST FTDI_SIO_GET_MODEM_STATUS | 733 | #define FTDI_SIO_GET_MODEM_STATUS_REQUEST FTDI_SIO_GET_MODEM_STATUS |