diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-18 00:41:27 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-18 00:41:27 +0300 |
commit | 0c6c887835b59c10602add88057c9c06f265effe (patch) | |
tree | b1ef9be8f1bc9f133803673b42b1b701ef79ecf2 /drivers/tty/serial/Makefile | |
parent | 8a5be36b9303ae167468d4f5e1b3c090b9981396 (diff) | |
parent | d8398bf840f8964220508aff7901c924e322f5e8 (diff) | |
download | linux-0c6c887835b59c10602add88057c9c06f265effe.tar.xz |
Merge tag 'for-linus' of git://github.com/openrisc/linux
Pull OpenRISC updates from Stafford Horne:
- New drivers and OpenRISC support for the LiteX platform
- A bug fix to support userspace gdb debugging
- Fixes one compile issue with blk-iocost
* tag 'for-linus' of git://github.com/openrisc/linux:
openrisc: add local64.h to fix blk-iocost build
openrisc: fix trap for debugger breakpoint signalling
openrisc: add support for LiteX
drivers/tty/serial: add LiteUART driver
dt-bindings: serial: document LiteUART bindings
drivers/soc/litex: add LiteX SoC Controller driver
dt-bindings: soc: document LiteX SoC Controller bindings
dt-bindings: vendor: add vendor prefix for LiteX
Diffstat (limited to 'drivers/tty/serial/Makefile')
-rw-r--r-- | drivers/tty/serial/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index af44b231123c..b85d53f9e9ff 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -89,6 +89,7 @@ obj-$(CONFIG_SERIAL_OWL) += owl-uart.o obj-$(CONFIG_SERIAL_RDA) += rda-uart.o obj-$(CONFIG_SERIAL_MILBEAUT_USIO) += milbeaut_usio.o obj-$(CONFIG_SERIAL_SIFIVE) += sifive.o +obj-$(CONFIG_SERIAL_LITEUART) += liteuart.o # GPIOLIB helpers for modem control lines obj-$(CONFIG_SERIAL_MCTRL_GPIO) += serial_mctrl_gpio.o |