diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-07-30 11:21:38 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-07-30 11:21:38 -0400 |
| commit | 0b39172ce2202bf4720ea65dba8b1d098c198acf (patch) | |
| tree | 782e0a5dfd30437bc5640d952a4df92f1f2fbd72 /config-generic | |
| parent | 9e4aeabc4e4836d78c996193dfc7287d55e311c2 (diff) | |
| download | kernel-0b39172ce2202bf4720ea65dba8b1d098c198acf.tar.gz kernel-0b39172ce2202bf4720ea65dba8b1d098c198acf.tar.xz kernel-0b39172ce2202bf4720ea65dba8b1d098c198acf.zip | |
3.0-git12 snapshot
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config-generic b/config-generic index c16ee83c4..58eb5c9c0 100644 --- a/config-generic +++ b/config-generic @@ -2357,6 +2357,7 @@ CONFIG_IPMI_POWEROFF=m # Watchdog Cards # CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_SOFT_WATCHDOG=m CONFIG_WDTPCI=m @@ -2391,6 +2392,7 @@ CONFIG_USBPCWATCHDOG=m CONFIG_WM8350_WATCHDOG=m CONFIG_WM831X_WATCHDOG=m # CONFIG_MAX63XX_WATCHDOG is not set +# CONFIG_DW_WATCHDOG is not set CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -2542,6 +2544,7 @@ CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m @@ -2603,6 +2606,7 @@ CONFIG_MEDIA_TUNER_MT2131=m CONFIG_MEDIA_TUNER_QT1010=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m @@ -2615,6 +2619,7 @@ CONFIG_MEDIA_TUNER_TDA18212=m # CONFIG_DVB_CAPTURE_DRIVERS=y CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y CONFIG_DVB_MAX_ADAPTERS=8 CONFIG_DVB_DYNAMIC_MINORS=y @@ -2623,6 +2628,8 @@ CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m @@ -2708,6 +2715,7 @@ CONFIG_DVB_LGS8GL5=m CONFIG_DVB_DUMMY_FE=m CONFIG_DVB_FIREDTV=m CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m CONFIG_DVB_MB86A20S=m CONFIG_DVB_USB_TECHNISAT_USB2=m CONFIG_DVB_DIB9000=m @@ -2785,6 +2793,7 @@ CONFIG_IR_RC6_DECODER=m CONFIG_IR_JVC_DECODER=m CONFIG_IR_SONY_DECODER=m CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_LIRC_CODEC=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m @@ -3279,6 +3288,7 @@ CONFIG_USB_GSPCA_SQ930X=m CONFIG_USB_GSPCA_NW80X=m CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_SE401=m CONFIG_USB_IBMCAM=m CONFIG_USB_KONICAWC=m @@ -3302,6 +3312,7 @@ 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 |