summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPiotr Zierhoffer <pzierhoffer@antmicro.com>2013-04-19 15:31:36 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2013-06-12 21:43:52 +0200
commitc0cd5eab127dadf3eebf6e9cc0006d9e7c9cbd51 (patch)
tree65909ee65e8ecd63eda0c39744eaa00a75989ceb /arch
parent2109c973badf1bdec9b78a6f954628c34397a190 (diff)
colibri_t20: support for tegra_v4l2_camera as module
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-colibri_t20.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c
index 3ca9abc20e44..5ee18722b871 100644
--- a/arch/arm/mach-tegra/board-colibri_t20.c
+++ b/arch/arm/mach-tegra/board-colibri_t20.c
@@ -104,7 +104,7 @@ static struct platform_device tegra_camera = {
};
#endif /* CONFIG_TEGRA_CAMERA */
-#ifdef CONFIG_VIDEO_TEGRA
+#if defined(CONFIG_VIDEO_TEGRA) || defined(CONFIG_VIDEO_TEGRA_MODULE)
static void tegra_camera_disable(struct nvhost_device *ndev)
{
}
@@ -141,7 +141,7 @@ static struct platform_device soc_camera = {
.platform_data = &iclink,
},
};
-#endif /* CONFIG_VIDEO_TEGRA */
+#endif /* CONFIG_VIDEO_TEGRA | CONFIG_VIDEO_TEGRA_MODULE */
/* CAN */
#if ((defined(CONFIG_CAN_MCP251X) || defined(CONFIG_CAN_MCP251X_MODULE)) && \
@@ -1512,10 +1512,10 @@ static void __init colibri_t20_init(void)
colibri_t20_register_spidev();
colibri_t20_mcp2515_can_init();
-#ifdef CONFIG_VIDEO_TEGRA
+#if defined(CONFIG_VIDEO_TEGRA) || defined(CONFIG_VIDEO_TEGRA_MODULE)
t20_get_tegra_vi01_device()->dev.platform_data = &tegra_camera_platform_data;
platform_device_register(&soc_camera);
-#endif /* CONFIG_VIDEO_TEGRA */
+#endif /* CONFIG_VIDEO_TEGRA | CONFIG_VIDEO_TEGRA_MODULE */
tegra_release_bootloader_fb();
}