summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-08 09:55:48 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-08 09:55:48 +0000
commit3abb77959d4ba844e219d84752cbff7d8d2c26f9 (patch)
tree09afee0ac2d90c6b207425bdc3d2d7ca4c24d2c3 /meta/packages
parent0223c7c8c2c4e83587ca92cb7e7ba8b4edb77c52 (diff)
downloadpoky-3abb77959d4ba844e219d84752cbff7d8d2c26f9.tar.gz
linux-omap-2.6.24.7: Fix compile failure
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5449 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/linux/linux-omap-2.6.24.7/fixes2.patch34
-rw-r--r--meta/packages/linux/linux-omap_2.6.24.7.bb3
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/fixes2.patch b/meta/packages/linux/linux-omap-2.6.24.7/fixes2.patch
new file mode 100644
index 0000000000..362368a6cf
--- /dev/null
+++ b/meta/packages/linux/linux-omap-2.6.24.7/fixes2.patch
@@ -0,0 +1,34 @@
1Index: linux-2.6.24/drivers/video/omap/omap_disp_out.c
2===================================================================
3--- linux-2.6.24.orig/drivers/video/omap/omap_disp_out.c 2008-10-08 10:53:04.000000000 +0100
4+++ linux-2.6.24/drivers/video/omap/omap_disp_out.c 2008-10-08 10:53:57.000000000 +0100
5@@ -1020,6 +1020,7 @@
6 else
7 return -EINVAL;
8
9+#ifdef CONFIG_OMAP2_TV
10 if (out_dev == OMAP2_OUTPUT_TV) {
11 if (tv_in_use == 0) {
12 h4_i2c_tvout_on(NULL);
13@@ -1027,6 +1028,7 @@
14 tv_in_use = 1;
15 }
16 }
17+#endif
18
19 if(omap2_disp_get_output_dev(layer) == out_dev)
20 return count;
21@@ -1050,11 +1052,13 @@
22 (omap2_disp_get_output_dev(OMAP2_VIDEO1) == OMAP2_OUTPUT_LCD) &&
23 (omap2_disp_get_output_dev(OMAP2_VIDEO2) == OMAP2_OUTPUT_LCD))
24 {
25+#ifdef CONFIG_OMAP2_TV
26 if (tv_in_use != 0) {
27 omap2_disp_disable_output_dev(OMAP2_OUTPUT_TV);
28 h4_i2c_tvout_off(NULL);
29 tv_in_use = 0;
30 }
31+#endif
32 }
33
34 return count;
diff --git a/meta/packages/linux/linux-omap_2.6.24.7.bb b/meta/packages/linux/linux-omap_2.6.24.7.bb
index 5baa320e1c..e04e5677fb 100644
--- a/meta/packages/linux/linux-omap_2.6.24.7.bb
+++ b/meta/packages/linux/linux-omap_2.6.24.7.bb
@@ -1,6 +1,6 @@
1require linux-omap.inc 1require linux-omap.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5COMPATIBLE_MACHINE = "omap-3430ldp|omap-3430sdp" 5COMPATIBLE_MACHINE = "omap-3430ldp|omap-3430sdp"
6DEFAULT_PREFERENCE = "1" 6DEFAULT_PREFERENCE = "1"
@@ -14,6 +14,7 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
14 http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;patch=1 \ 14 http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;patch=1 \
15 file://linux-2.6.24.7-ldp-v1.4.patch.gz;patch=1 \ 15 file://linux-2.6.24.7-ldp-v1.4.patch.gz;patch=1 \
16 file://fixes.patch;patch=1 \ 16 file://fixes.patch;patch=1 \
17 file://fixes2.patch;patch=1 \
17 file://module_fix.patch;patch=1 \ 18 file://module_fix.patch;patch=1 \
18 file://defconfig-${MACHINE}" 19 file://defconfig-${MACHINE}"
19 20