summaryrefslogtreecommitdiffstats
path: root/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0012-ARM-OMAP3-make-camera-code-build-if-MT9T111-is-built.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0012-ARM-OMAP3-make-camera-code-build-if-MT9T111-is-built.patch')
-rw-r--r--extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0012-ARM-OMAP3-make-camera-code-build-if-MT9T111-is-built.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0012-ARM-OMAP3-make-camera-code-build-if-MT9T111-is-built.patch b/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0012-ARM-OMAP3-make-camera-code-build-if-MT9T111-is-built.patch
new file mode 100644
index 00000000..7edb1563
--- /dev/null
+++ b/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0012-ARM-OMAP3-make-camera-code-build-if-MT9T111-is-built.patch
@@ -0,0 +1,38 @@
1From a36ff286ba2355488bd093f001a722d888cf9a8b Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed, 16 Jun 2010 09:45:46 +0200
4Subject: [PATCH 12/75] ARM: OMAP3: make camera code build if MT9T111 is built as module or disabled
5
6---
7 arch/arm/mach-omap2/board-omap3beagle.c | 4 +++-
8 1 files changed, 3 insertions(+), 1 deletions(-)
9
10diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
11index 757d430..1e9a868 100644
12--- a/arch/arm/mach-omap2/board-omap3beagle.c
13+++ b/arch/arm/mach-omap2/board-omap3beagle.c
14@@ -71,7 +71,7 @@ static struct omap_opp * _omap35x_l3_rate_table = NULL;
15 static struct omap_opp * _omap37x_l3_rate_table = NULL;
16 #endif /* CONFIG_PM */
17
18-#ifdef CONFIG_VIDEO_MT9T111
19+#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
20 #include <media/v4l2-int-device.h>
21 #include <media/mt9t111.h>
22 extern struct mt9t111_platform_data mt9t111_pdata;
23@@ -594,10 +594,12 @@ static struct i2c_board_info __initdata beagle_zippy_i2c2_boardinfo[] = {};
24 #endif
25
26 static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {
27+#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
28 {
29 I2C_BOARD_INFO("mt9t111", MT9T111_I2C_ADDR),
30 .platform_data = &mt9t111_pdata,
31 },
32+#endif
33 };
34
35 static int __init omap3_beagle_i2c_init(void)
36--
371.6.6.1
38