Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts Fix merge botch



details:   https://anonhg.NetBSD.org/src/rev/e02213fe3959
branches:  trunk
changeset: 968141:e02213fe3959
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jan 03 15:40:38 2020 +0000

description:
Fix merge botch

diffstat:

 sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r e1a92f7d40ce -r e02213fe3959 sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi  Fri Jan 03 15:04:33 2020 +0000
+++ b/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi  Fri Jan 03 15:40:38 2020 +0000
@@ -74,14 +74,14 @@
                        compatible = "brcm,bcm2835-pixelvalve0";
                        reg = <0x7e206000 0x100>;
                        interrupts = <2 13>; /* pwa0 */
-                       status = "disabled"
+                       status = "disabled";
                };
 
                pixelvalve@7e207000 {
                        compatible = "brcm,bcm2835-pixelvalve1";
                        reg = <0x7e207000 0x100>;
                        interrupts = <2 14>; /* pwa1 */
-                       status = "disabled"
+                       status = "disabled";
                };
 
                thermal: thermal@7e212000 {
@@ -106,7 +106,7 @@
                        compatible = "brcm,bcm2835-pixelvalve2";
                        reg = <0x7e807000 0x100>;
                        interrupts = <2 10>; /* pixelvalve */
-                       status = "disabled"
+                       status = "disabled";
                };
 
                hdmi: hdmi@7e902000 {



Home | Main Index | Thread Index | Old Index