Skip to content
Commit 45cb814d authored by Meng Li's avatar Meng Li Committed by Bruce Ashfield
Browse files

serial: pl011: fix building conflict caused by upgrading kernel



After upgrading kernel, the commit 211565b1("serial: pl011:
UPSTAT_AUTORTS requires .throttle/unthrottle") is involved from
mainline upstream. But it confilts with previous commit 0f0f7d7e
("tty: amba-pl011: Add un/throttle support") that is from SDK repo.
So, remove the SDK code and keep the upstream code to avoid the
building issue.

Signed-off-by: default avatarMeng Li <Meng.Li@windriver.com>
Signed-off-by: default avatarBruce Ashfield <bruce.ashfield@gmail.com>
parent ec0295b5
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment