summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguoyin.chen <guoyin.chen@freescale.com>2012-12-25 10:52:06 +0800
committerLiu Ying <Ying.liu@freescale.com>2012-12-26 13:15:39 +0800
commita0f146f6298cb87e4ebd0ad78d40b5b32634b070 (patch)
tree0e496909f578b44ef4d052c4e392b98047771ae7
parentad7f34362535feae2fb2a97003f7ebce5898728b (diff)
ENGR00238201-2 V4L2:ADV7180:driver kconfig change
Move ADV7180 out of choice to make it be enabled with other camera config simultaneously Signed-off-by: guoyin.chen <guoyin.chen@freescale.com> (cherry picked from commit a6becd9a87da4fe0bdcc0e96d690377078c856b9)
-rw-r--r--drivers/media/video/mxc/capture/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/mxc/capture/Kconfig b/drivers/media/video/mxc/capture/Kconfig
index 243b888c0f4f..3013155fb03a 100644
--- a/drivers/media/video/mxc/capture/Kconfig
+++ b/drivers/media/video/mxc/capture/Kconfig
@@ -99,13 +99,14 @@ config MXC_CAMERA_OV5642
---help---
If you plan to use the ov5642 Camera with your MXC system, say Y here.
+endchoice
+
config MXC_TVIN_ADV7180
tristate "Analog Device adv7180 TV Decoder Input support"
depends on (MACH_MX35_3DS || MACH_MX51_3DS || MACH_MX6Q_SABREAUTO || MACH_MX6Q_ARM2)
---help---
If you plan to use the adv7180 video decoder with your MXC system, say Y here.
-endchoice
config MXC_CAMERA_OV5640_MIPI
tristate "OmniVision ov5640 camera support using mipi"