diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-11-01 15:13:32 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-01 15:15:29 -0400 |
| commit | 906f34d53bd601a61ff7567e00495c78aa5f62ef (patch) | |
| tree | 27d7c0d99f19bb4c008204aec3a9e58595ac7b49 /config-generic | |
| parent | bf976a17c4b2c2b164f6413d52ffbdab09a26d1a (diff) | |
| download | kernel-906f34d53bd601a61ff7567e00495c78aa5f62ef.tar.gz kernel-906f34d53bd601a61ff7567e00495c78aa5f62ef.tar.xz kernel-906f34d53bd601a61ff7567e00495c78aa5f62ef.zip | |
Linux 3.1-git4 (upstream dc47d3810cdc)
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/config-generic b/config-generic index 6ec1960f7..e56124b05 100644 --- a/config-generic +++ b/config-generic @@ -2094,7 +2094,6 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m @@ -2628,6 +2627,9 @@ CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_ZORAN_ZR36060=m CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TLG2300=m # CONFIG_VIDEO_TIMBERDALE is not set # CONFIG_VIDEO_M5MOLS is not set @@ -2755,6 +2757,13 @@ CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_DW2102=m CONFIG_DVB_USB_FRIIO=m CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_TDA10071=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_A8293=m +CONFIG_DVB_IT913X_FE=m CONFIG_DVB_DM1105=m CONFIG_DVB_S921=m CONFIG_DVB_ISL6405=m @@ -2834,6 +2843,7 @@ CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_RC_CORE=m CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m +CONFIG_RC_ATI_REMOTE=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m @@ -2849,6 +2859,7 @@ CONFIG_IR_NUVOTON=m CONFIG_IR_FINTEK=m CONFIG_IR_REDRAT3=m + CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set @@ -3308,6 +3319,7 @@ CONFIG_USB_GSPCA_SPCA561=m CONFIG_USB_GSPCA_STK014=m CONFIG_USB_GSPCA_SUNPLUS=m CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m CONFIG_USB_GSPCA_TV8532=m CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_ZC3XX=m @@ -3954,6 +3966,9 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_USER=m + + # Random number generation @@ -4413,7 +4428,6 @@ CONFIG_UWB_I1480U=m CONFIG_STAGING=y # CONFIG_ET131X is not set # CONFIG_SLICOSS is not set -# CONFIG_VIDEO_TM6000 is not set # CONFIG_WLAGS49_H2 is not set # CONFIG_WLAGS49_H25 is not set # CONFIG_VIDEO_DT3155 is not set @@ -4461,7 +4475,7 @@ CONFIG_USB_ATMEL=m # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set # CONFIG_RTS_PSTOR is not set # CONFIG_DRM_PSB is not set -# CONFIG_ALTERA_STAPL is not set +CONFIG_ALTERA_STAPL=m # CONFIG_DVB_CXD2099 is not set # CONFIG_USBIP_CORE is not set # CONFIG_BRCMSMAC is not set |