diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-04 19:57:23 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-04 19:57:45 +0300 |
| commit | 817e9bc8cc04e5c70592525b96812c46c1aa1c46 (patch) | |
| tree | d1a1a20d88a31d41190360d5d85efefbaecbf2ef /include/linux/serial_core.h | |
| parent | aad2d4952d24d8910d9fc64da9107df0fb780a09 (diff) | |
| download | linux-817e9bc8cc04e5c70592525b96812c46c1aa1c46.tar.xz | |
Revert "serial:serial_core: Allow use of CTS for PPS line discipline"
This reverts commit c550f01c810f2197c98e6e3103f81797f5e063be.
Turns out the samsung tty driver is mucking around in the "unused" port
fields and this patch breaks that code :(
So we need to fix that driver up before this can be accepted.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 4e2ba4894dcc..047fa67d039b 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -257,8 +257,7 @@ struct uart_port { struct device *dev; /* parent device */ unsigned char hub6; /* this should be in the 8250 driver */ unsigned char suspended; - unsigned char pps_4wire; /* CTS instead of DCD */ - unsigned char unused; + unsigned char unused[2]; const char *name; /* port name */ struct attribute_group *attr_group; /* port specific attributes */ const struct attribute_group **tty_groups; /* all attributes (serial core use only) */ |