diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 11:05:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 11:05:58 +0300 |
| commit | 5c07488d996b6b2af609f351bf54c9909ed0fdf8 (patch) | |
| tree | 62cc2522698d7383cdf4a4f450bde30bc45f1832 /arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | |
| parent | b5390f4b5e0b75634c7f08c88e97b5fe0e833599 (diff) | |
| parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
| download | linux-5c07488d996b6b2af609f351bf54c9909ed0fdf8.tar.xz | |
Merge 5.0-rc6 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/sun8i-h3-beelink-x2.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts index 5d23667dc2d2..25540b7694d5 100644 --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts @@ -53,7 +53,7 @@ aliases { serial0 = &uart0; - /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet0 = &emac; ethernet1 = &sdiowifi; }; |