diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/usb/serial/ftdi_sio.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 90dcc625f70d..76db2fef4657 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -393,8 +393,8 @@ static const char *ftdi_chip_name[] = { | |||
| 393 | #define FTDI_STATUS_B1_MASK (FTDI_RS_BI) | 393 | #define FTDI_STATUS_B1_MASK (FTDI_RS_BI) |
| 394 | /* End TIOCMIWAIT */ | 394 | /* End TIOCMIWAIT */ |
| 395 | 395 | ||
| 396 | #define FTDI_IMPL_ASYNC_FLAGS = ( ASYNC_SPD_HI | ASYNC_SPD_VHI \ | 396 | #define FTDI_IMPL_ASYNC_FLAGS = (ASYNC_SPD_HI | ASYNC_SPD_VHI \ |
| 397 | ASYNC_SPD_CUST | ASYNC_SPD_SHI | ASYNC_SPD_WARP ) | 397 | | ASYNC_SPD_CUST | ASYNC_SPD_SHI | ASYNC_SPD_WARP) |
| 398 | 398 | ||
| 399 | /* function prototypes for a FTDI serial converter */ | 399 | /* function prototypes for a FTDI serial converter */ |
| 400 | static int ftdi_sio_probe (struct usb_serial *serial, const struct usb_device_id *id); | 400 | static int ftdi_sio_probe (struct usb_serial *serial, const struct usb_device_id *id); |