diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 11:19:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 11:19:01 +0300 |
| commit | 9749c37275cb1f72d309e676642f45eb92724190 (patch) | |
| tree | 7ecfdc655eebb56ddfee430f7f05e641ec4b49bb /arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | |
| parent | 4f9adc8f91ba996374cd9487ecd1180fa99b9438 (diff) | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
| download | linux-9749c37275cb1f72d309e676642f45eb92724190.tar.xz | |
Merge 4.13-rc7 into char-misc-next
We want the binder fix in here as well for testing and merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts')
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index 08cda24ea194..827168bc22ed 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -51,6 +51,7 @@ compatible = "pine64,pine64", "allwinner,sun50i-a64"; aliases { + ethernet0 = &emac; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; |