diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/usb/serial/ftdi_sio.c | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 7c229d304684..ff8605b4b4be 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -1724,7 +1724,8 @@ static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv) | |||
| 1724 | 1724 | ||
| 1725 | /* | 1725 | /* |
| 1726 | * Module parameter to control latency timer for NDI FTDI-based USB devices. | 1726 | * Module parameter to control latency timer for NDI FTDI-based USB devices. |
| 1727 | * If this value is not set in modprobe.conf.local its value will be set to 1ms. | 1727 | * If this value is not set in /etc/modprobe.d/ its value will be set |
| 1728 | * to 1ms. | ||
| 1728 | */ | 1729 | */ |
| 1729 | static int ndi_latency_timer = 1; | 1730 | static int ndi_latency_timer = 1; |
| 1730 | 1731 | ||