aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch')
-rw-r--r--recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch b/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch
index 0f69e58fbc..d9554e1455 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch
@@ -1,4 +1,4 @@
-From d03b9f3dc00274820bed99cc22d8425d6bf0e7b4 Mon Sep 17 00:00:00 2001
+From ba26db491acb2d0ee6ef6e51756e843dfd56a125 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <steve@sakoman.com>
Date: Tue, 19 Jan 2010 21:19:15 -0800
Subject: [PATCH 14/45] DSS2: add bootarg for selecting svideo or composite for tv output
@@ -10,7 +10,7 @@ also add pal-16 and ntsc-16 omapfb.mode settings for 16bpp
2 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
-index 1127e85..53fa54e 100644
+index 8be116f..fbfc24b 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -87,6 +87,11 @@
@@ -25,7 +25,7 @@ index 1127e85..53fa54e 100644
struct venc_config {
u32 f_control;
u32 vidout_ctrl;
-@@ -430,6 +435,23 @@ static int venc_panel_probe(struct omap_dss_device *dssdev)
+@@ -432,6 +437,23 @@ static int venc_panel_probe(struct omap_dss_device *dssdev)
{
dssdev->panel.timings = omap_dss_pal_timings;