diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-13 12:33:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-13 12:33:35 -0700 |
| commit | 438630ef5b3c8755d642b6ca3bc10625ab0af79b (patch) | |
| tree | 69ea9bc5b04be9a8e872accee0514382a6326704 /include | |
| parent | dd95f1860768e340875d6a325df18d73f2dea304 (diff) | |
| parent | 9527b82ae3af1ebf465506868fb55e7f862cd9da (diff) | |
| download | linux-438630ef5b3c8755d642b6ca3bc10625ab0af79b.tar.bz2 | |
Merge tag 'tty-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial fixes from Greg KH:
"Here are two tty serial driver fixes for 4.13-rc5. One is a revert of
a -rc1 patch that turned out to not be a good idea, and the other is a
fix for the pl011 serial driver.
Both have been in linux-next with no reported issues"
* tag 'tty-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
Revert "serial: Delete dead code for CIR serial ports"
tty: pl011: fix initialization order of QDF2400 E44
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index c749eef1daa1..27b4b6615263 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1209,6 +1209,7 @@ static inline bool acpi_has_watchdog(void) { return false; } #endif #ifdef CONFIG_ACPI_SPCR_TABLE +extern bool qdf2400_e44_present; int parse_spcr(bool earlycon); #else static inline int parse_spcr(bool earlycon) { return 0; } |