diff options
| author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2014-10-08 21:57:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-06 04:29:05 +0100 |
| commit | aad31088dbfe6016147469974f0cd6c3f3201f3e (patch) | |
| tree | 4b317469ae322c1e93dbd12724c6027644988ee8 /drivers/tty/serial | |
| parent | serial: 8250_dw: Add DMA support for non-ACPI platforms (diff) | |
| download | linux-aad31088dbfe6016147469974f0cd6c3f3201f3e.tar.xz linux-aad31088dbfe6016147469974f0cd6c3f3201f3e.zip | |
serial/max310x: Remove obsolete #ifset TIOC[SG]RS485
Commit e676253b19b2 ("serial/8250: Add support for RS485 IOCTLs") added
references to TIOC[SG]RS48 on 8250_core.c. This change triggered the
need to define them in all the arches that uses tty/serial.
This made #ifdef TIOC[SG]RS48 obsolete.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/max310x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 4cdc555604c9..ecb466701ede 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -880,7 +880,6 @@ static void max310x_set_termios(struct uart_port *port, static int max310x_ioctl(struct uart_port *port, unsigned int cmd, unsigned long arg) { -#if defined(TIOCSRS485) && defined(TIOCGRS485) struct serial_rs485 rs485; unsigned int val; @@ -923,7 +922,6 @@ static int max310x_ioctl(struct uart_port *port, unsigned int cmd, default: break; } -#endif return -ENOIOCTLCMD; } |