Merge tag 'tty-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty driver reverts from Greg KH: "Here are some reverts for some tty patches (specifically the pl011 driver) that ended up breaking a bunch of machines (i.e. almost all of the ones with this chip). People are working on a fix for this, but in the meantime, it's best to just revert all 5 patches to restore people's serial consoles. These reverts have been in linux-next for many days now" * tag 'tty-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "uart: pl011: Rename regs with enumeration" Revert "uart: pl011: Introduce register accessor" Revert "uart: pl011: Introduce register look up table" Revert "uart: pl011: Improve LCRH register access decision" Revert "uart: pl011: Add support to ZTE ZX296702 uart"
This commit is contained in:
@@ -47,12 +47,12 @@ config SERIAL_AMBA_PL010_CONSOLE
|
||||
|
||||
config SERIAL_AMBA_PL011
|
||||
tristate "ARM AMBA PL011 serial port support"
|
||||
depends on ARM_AMBA || SOC_ZX296702
|
||||
depends on ARM_AMBA
|
||||
select SERIAL_CORE
|
||||
help
|
||||
This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have
|
||||
an Integrator/PP2, Integrator/CP or Versatile platform, say Y or M
|
||||
here. Say Y or M if you have SOC_ZX296702.
|
||||
here.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user