diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:58:29 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:58:29 +0100 |
commit | 8f4bf4bcc4d6f70a47baec5d73bd411e572842e0 (patch) | |
tree | 8ed86ebd19c32a629bfcfb43378bf32acd14c7d6 /arch/arm/boot/dts/sun6i-a31.dtsi | |
parent | 1ed39bac21c3c2934b18de34df9478ad7b8edf1f (diff) | |
parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) |
Merge tag 'v3.19-rc7' into perf/core, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/sun6i-a31.dtsi')
-rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index f47156b6572b..1e7e7bcf8307 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -53,12 +53,6 @@ interrupt-parent = <&gic>; aliases { - serial0 = &uart0; - serial1 = &uart1; - serial2 = &uart2; - serial3 = &uart3; - serial4 = &uart4; - serial5 = &uart5; ethernet0 = &gmac; }; |