diff options
author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2014-10-08 15:57:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 22:29:05 -0500 |
commit | aad31088dbfe6016147469974f0cd6c3f3201f3e (patch) | |
tree | 4b317469ae322c1e93dbd12724c6027644988ee8 /drivers/tty/serial/max310x.c | |
parent | a8b26e1af94825296f29eee6bfc001c5543d3c7e (diff) |
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/max310x.c')
-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, | |||
880 | static int max310x_ioctl(struct uart_port *port, unsigned int cmd, | 880 | static int max310x_ioctl(struct uart_port *port, unsigned int cmd, |
881 | unsigned long arg) | 881 | unsigned long arg) |
882 | { | 882 | { |
883 | #if defined(TIOCSRS485) && defined(TIOCGRS485) | ||
884 | struct serial_rs485 rs485; | 883 | struct serial_rs485 rs485; |
885 | unsigned int val; | 884 | unsigned int val; |
886 | 885 | ||
@@ -923,7 +922,6 @@ static int max310x_ioctl(struct uart_port *port, unsigned int cmd, | |||
923 | default: | 922 | default: |
924 | break; | 923 | break; |
925 | } | 924 | } |
926 | #endif | ||
927 | 925 | ||
928 | return -ENOIOCTLCMD; | 926 | return -ENOIOCTLCMD; |
929 | } | 927 | } |