summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2012-02-26 04:09:41 +0800
committerAndy Green <andy.green@linaro.org>2012-03-07 15:17:26 +0800
commitbfdddac8a890b43c6f94e50cecdfe0ec9b1ad045 (patch)
tree9e36f9defd9dee9b64b5e82f785c2a52284f7b29
parent86426d3e4ca2714263a0061e0331b356d498e599 (diff)
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--arch/arm/configs/omap_5430evm_defconfig9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/configs/omap_5430evm_defconfig b/arch/arm/configs/omap_5430evm_defconfig
index 31847c25888..d6d1936bd4c 100644
--- a/arch/arm/configs/omap_5430evm_defconfig
+++ b/arch/arm/configs/omap_5430evm_defconfig
@@ -108,6 +108,13 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_PALMAS=y
CONFIG_HIDRAW=y
CONFIG_USB_HIDDEV=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_VIDEO_DEV=y
+# CONFIG_RC_CORE is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_RADIO_ADAPTERS is not set
CONFIG_DRM=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_MODE_HELPERS=y
@@ -132,8 +139,6 @@ CONFIG_SND_SOC=y
CONFIG_SND_OMAP_SOC=y
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y
CONFIG_SND_OMAP_SOC_SDP4430=y
-# CONFIG_HID_SUPPORT is not set
->>>>>>> patched
CONFIG_USB=y
CONFIG_USB_DEBUG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y