diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-07 08:14:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-07 08:14:59 +0200 |
| commit | 4ebaf0754c7a1109e66693f488f02b78f5875fee (patch) | |
| tree | 025219a2a74d9a35d831ef201cff22f19ac6bd44 /include | |
| parent | cc02f852872d2f9f3a15b3429b77998271814de0 (diff) | |
| parent | 5b162cc4ac27ba76e576abc9090c54cf90a17980 (diff) | |
Merge tag 'tty-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
I wrote:
"Serial driver fixes for 4.19-rc7
Here are 3 small serial driver fixes for 4.19-rc7
- 2 sh-sci bugfixes for reported issues
- a revert of the PM handling for the 8250_dw code
All of these have been in linux-next with no reported issues."
* tag 'tty-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
Revert "serial: sh-sci: Allow for compressed SCIF address"
Revert "serial: sh-sci: Remove SCIx_RZ_SCIFA_REGTYPE"
Revert "serial: 8250_dw: Fix runtime PM handling"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_sci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index c0e795d95477..1c89611e0e06 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h @@ -36,6 +36,7 @@ enum { SCIx_SH4_SCIF_FIFODATA_REGTYPE, SCIx_SH7705_SCIF_REGTYPE, SCIx_HSCIF_REGTYPE, + SCIx_RZ_SCIFA_REGTYPE, SCIx_NR_REGTYPES, }; |