diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 09:11:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 09:11:37 -0700 |
| commit | 5874cfed0b04f53146f70a519a2371cea5f39178 (patch) | |
| tree | d99173f58d0d95e0cc19bb53f6c298a03d9180d9 /arch | |
| parent | 850ebc0c0c50e24126461eec3ca4d07308560058 (diff) | |
| parent | e4cf39ea473329dfc07de1246f97d27b7fc96f79 (diff) | |
| download | linux-5874cfed0b04f53146f70a519a2371cea5f39178.tar.gz linux-5874cfed0b04f53146f70a519a2371cea5f39178.tar.bz2 linux-5874cfed0b04f53146f70a519a2371cea5f39178.zip | |
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.dts | 2 |
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 { |