diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-13 17:45:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-13 17:45:06 +1100 |
| commit | 0fd863728bd13129b529350fe4b505337f6ba5d6 (patch) | |
| tree | 51be75b694ef9beb5f1341fdbbb5b761683fe7bf /drivers/net/irda | |
| parent | e0a9a53b68a3bf49af9a4065870c007e8d76e832 (diff) | |
| parent | f2eca58f2ad92ed20cc96b765a18525d5ace2d19 (diff) | |
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/i2c/busses/Kconfig
drivers/lguest/Kconfig
drivers/net/can/Kconfig
drivers/net/wan/Kconfig
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/irda/irtty-sir.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 59e9d9e1fd0f..2a30193d0d50 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig @@ -5,7 +5,7 @@ comment "SIR device drivers" config IRTTY_SIR tristate "IrTTY (uses Linux serial driver)" - depends on IRDA + depends on IRDA && TTY help Say Y here if you want to build support for the IrTTY line discipline. To compile it as a module, choose M here: the module diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index 6e4d4b62c9a8..a41267197839 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c @@ -210,7 +210,7 @@ static int irtty_do_write(struct sir_dev *dev, const unsigned char *ptr, size_t * been received, which can now be decapsulated and delivered for * further processing * - * calling context depends on underlying driver and tty->low_latency! + * calling context depends on underlying driver and tty->port->low_latency! * for example (low_latency: 1 / 0): * serial.c: uart-interrupt / softint * usbserial: urb-complete-interrupt / softint |