git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-4.21/block-20190102' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
bcm988312hr.dts
diff --git
a/arch/arm/boot/dts/bcm988312hr.dts
b/arch/arm/boot/dts/bcm988312hr.dts
index ea9a0806b44605dc96a9ba90ed89dc5c1bdc3c3a..e39db14d805e162b9ed9e92e57dfdca5844e0077 100644
(file)
--- a/
arch/arm/boot/dts/bcm988312hr.dts
+++ b/
arch/arm/boot/dts/bcm988312hr.dts
@@
-39,10
+39,6
@@
model = "NorthStar Plus SVK (BCM988312HR)";
compatible = "brcm,bcm88312", "brcm,nsp";
model = "NorthStar Plus SVK (BCM988312HR)";
compatible = "brcm,bcm88312", "brcm,nsp";
- aliases {
- serial0 = &uart0;
- };
-
chosen {
stdout-path = "serial0:115200n8";
};
chosen {
stdout-path = "serial0:115200n8";
};