diff options
-rw-r--r-- | config-generic | 19 | ||||
-rw-r--r-- | kernel.spec | 5 |
2 files changed, 7 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 diff --git a/kernel.spec b/kernel.spec index 83221cbf7..c8b2898b4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2017,6 +2017,11 @@ fi # ||----w | # || || %changelog +* Wed Oct 26 2011 Kyle McMartin <kmcmartin@redhat.com> +- Make some config changes caught during a review: + - CONFIG_SOC_CAMERA: disable, it's only for some ARM boards + - CONFIG_MEDIA_ALTERA_CI=m: needed for some DVB boards + * Wed Oct 26 2011 Chuck Ebbert <cebbert@redhat.com> - Add build option "--with=release" to build a non-debug kernel in rawhide. |