summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRicardo Perez Olivares <x0081762@ti.com>2010-06-01 14:49:00 -0500
committerRicardo Perez Olivares <x0081762@ti.com>2010-06-01 14:49:00 -0500
commit2ed0f9329a6ffa4bbc9264a8beb9212f00fb55a8 (patch)
treebbe02194d949846f027d1769d2e07a065f23df40 /arch
parent157b08cf9d66f4beb0266cbb2ce868d5096b43bb (diff)
OMAP4: omap_4430sdp_defconfig: Fix to avoid overrite of definitions
This patch fixes the following duplicated definitions: :936:warning: override: reassigning to symbol VIDEO_DEV :937:warning: override: reassigning to symbol VIDEO_V4L2_COMMON :938:warning: override: reassigning to symbol VIDEO_ALLOW_V4L1 :939:warning: override: reassigning to symbol VIDEO_V4L1_COMPAT :940:warning: override: reassigning to symbol DVB_CORE :941:warning: override: reassigning to symbol VIDEO_MEDIA :946:warning: override: reassigning to symbol IR_CORE :947:warning: override: reassigning to symbol VIDEO_IR :948:warning: override: reassigning to symbol MEDIA_ATTACH :949:warning: override: reassigning to symbol MEDIA_TUNER :950:warning: override: reassigning to symbol MEDIA_TUNER_CUSTOMISE :951:warning: override: reassigning to symbol MEDIA_TUNER_SIMPLE :952:warning: override: reassigning to symbol MEDIA_TUNER_TDA8290 :953:warning: override: reassigning to symbol MEDIA_TUNER_TDA9887 :954:warning: override: reassigning to symbol MEDIA_TUNER_TEA5761 :955:warning: override: reassigning to symbol MEDIA_TUNER_TEA5767 :956:warning: override: reassigning to symbol MEDIA_TUNER_MT20XX :957:warning: override: reassigning to symbol MEDIA_TUNER_XC2028 :958:warning: override: reassigning to symbol MEDIA_TUNER_XC5000 :959:warning: override: reassigning to symbol MEDIA_TUNER_MC44S803 :960:warning: override: reassigning to symbol VIDEO_V4L2 :963:warning: override: reassigning to symbol VIDEO_CAPTURE_DRIVERS :964:warning: override: reassigning to symbol VIDEO_ADV_DEBUG :965:warning: override: reassigning to symbol VIDEO_FIXED_MINOR_RANGES :966:warning: override: reassigning to symbol VIDEO_HELPER_CHIPS_AUTO :967:warning: override: reassigning to symbol VIDEO_IR_I2C :968:warning: override: reassigning to symbol VIDEO_VIVI :970:warning: override: reassigning to symbol VIDEO_SAA5246A :971:warning: override: reassigning to symbol VIDEO_SAA5249 :972:warning: override: reassigning to symbol SOC_CAMERA :973:warning: override: reassigning to symbol RADIO_ADAPTERS :974:warning: override: reassigning to symbol I2C_SI4713 :975:warning: override: reassigning to symbol RADIO_SI4713 :976:warning: override: reassigning to symbol RADIO_SI470X :977:warning: override: reassigning to symbol RADIO_TEA5764 :978:warning: override: reassigning to symbol RADIO_SAA7706H :979:warning: override: reassigning to symbol RADIO_TEF6862 :980:warning: override: reassigning to symbol DAB :1123:warning: override: reassigning to symbol SOUND Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/configs/omap_4430sdp_defconfig48
1 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig
index 17c56ae4f6f8..07b5ac991148 100755
--- a/arch/arm/configs/omap_4430sdp_defconfig
+++ b/arch/arm/configs/omap_4430sdp_defconfig
@@ -910,54 +910,6 @@ CONFIG_MEDIA_TUNER_XC2028=y
CONFIG_MEDIA_TUNER_XC5000=y
CONFIG_MEDIA_TUNER_MC44S803=y
CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_SOC_CAMERA is not set
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_RADIO_SI470X is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_SAA7706H is not set
-# CONFIG_RADIO_TEF6862 is not set
-# CONFIG_DAB is not set
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_DVB_CORE is not set
-CONFIG_VIDEO_MEDIA=y
-
-#
-# Multimedia drivers
-#
-CONFIG_IR_CORE=y
-CONFIG_VIDEO_IR=y
-# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=y
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_MC44S803=y
-CONFIG_VIDEO_V4L2=y
CONFIG_VIDEOBUF_GEN=y
CONFIG_VIDEOBUF_DMA_SG=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y