tree c484b78bf0ba3866df641594026c81e5a25df674
parent 4495c08e84729385774601b5146d51d9e5849f81
author Aleksey Makarov <aleksey.makarov@linaro.org> 1488381782 +0300
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1489460344 +0800

Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"

The original patch makes the condition always true, so it is wrong.

It masks (but not fixes) the bug described in the commit message
but introduces a regression (no console is selected by SPCR)
in regular (no 'console=ttyAMA') case.

s/||/&&/ would not fix the problem as the root cause was identified
incorrectly.

This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b.

Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>