diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-03 18:29:31 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-03 18:29:31 (GMT) |
commit | 39da979c98cf7516bc7b2c648ee4aed528eb1f36 (patch) | |
tree | 93d6cc5690769fd6e4cfc6d35582472714ad71a2 /include | |
parent | 70dad4998ee482f08c85c5956765ea6c31da8734 (diff) | |
parent | c8d192428f52f244130b84650ad616df09f2b1e1 (diff) | |
download | linux-39da979c98cf7516bc7b2c648ee4aed528eb1f36.tar.xz |
Merge tag 'tty-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull serial driver fixes from Greg KH:
"Here are some small serial driver fixes for 4.8-rc5. One fixes an
oft-reported build issue with the fintek driver, another reverts a
patch that was causing problems, one fixes a crash, and some new
device ids were added.
All of these have been in linux-next for a while"
* tag 'tty-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
serial: 8250: added acces i/o products quad and octal serial cards
serial: 8250_mid: fix divide error bug if baud rate is 0
Revert "tty/serial/8250: use mctrl_gpio helpers"
8250/fintek: rename IRQ_MODE macro
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/serial_8250.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index 923266c..48ec765 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h @@ -111,7 +111,6 @@ struct uart_8250_port { * if no_console_suspend */ unsigned char probe; - struct mctrl_gpios *gpios; #define UART_PROBE_RSA (1 << 0) /* |