summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-10-27 12:14:19 -0400
committerKyle McMartin <kyle@redhat.com>2011-10-27 12:14:19 -0400
commit080adf836d64c052122f89deaf20da0555288387 (patch)
treee7f0dd283bfc9b3376533b1fe21d7719d1ed6e6e /config-generic
parent11ee03372b8b1997e8a7cbf3c941c1200c6c30ad (diff)
downloadkernel-080adf836d64c052122f89deaf20da0555288387.tar.gz
kernel-080adf836d64c052122f89deaf20da0555288387.tar.xz
kernel-080adf836d64c052122f89deaf20da0555288387.zip
some dvb config changes noticed during kconfig review
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic19
1 files changed, 2 insertions, 17 deletions
diff --git a/config-generic b/config-generic
index 491933d00..ea9b535c4 100644
--- a/config-generic
+++ b/config-generic
@@ -2582,7 +2582,7 @@ CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CPIA2=m
CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_CX23885=m
-# CONFIG_MEDIA_ALTERA_CI is not set
+CONFIG_MEDIA_ALTERA_CI=m
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX88=m
@@ -3324,22 +3324,7 @@ CONFIG_USB_S2255=m
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_USB_SN9C102 is not set
CONFIG_USB_ZR364XX=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV9740=m
+# CONFIG_SOC_CAMERA is not set
#
# USB Network adaptors