summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-12 09:11:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-12 09:11:37 -0700
commit5874cfed0b04f53146f70a519a2371cea5f39178 (patch)
treed99173f58d0d95e0cc19bb53f6c298a03d9180d9 /arch
parent850ebc0c0c50e24126461eec3ca4d07308560058 (diff)
parente4cf39ea473329dfc07de1246f97d27b7fc96f79 (diff)
downloadlinux-5874cfed0b04f53146f70a519a2371cea5f39178.tar.bz2
Merge tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen: "Minor fixes for amba-clcd and video DT bindings" * tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: video: ARM CLCD: Fix color model capabilities for DT platforms video: fix composite video connector compatible string
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/omap3-n900.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 1fe45d1f75ec..4361777a08d8 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -93,7 +93,7 @@
};
tv: connector {
- compatible = "composite-connector";
+ compatible = "composite-video-connector";
label = "tv";
port {