diff options
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 50 |
1 files changed, 46 insertions, 4 deletions
diff --git a/config-generic b/config-generic index 3c3e26060..a4ff8cfeb 100644 --- a/config-generic +++ b/config-generic @@ -119,12 +119,13 @@ CONFIG_PCMCIA_IOCTL=y CONFIG_PCCARD=y CONFIG_MMC=m -CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_SDIO_UART=m # CONFIG_MMC_TEST is not set # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDRICOH_CS=m @@ -134,6 +135,7 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_CB710=m CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_USHC=m CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set @@ -1580,6 +1582,8 @@ CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_TSCAN1=m +CONFIG_PCH_CAN=m CONFIG_NETROM=m CONFIG_ROSE=m CONFIG_MKISS=m @@ -2062,6 +2066,7 @@ CONFIG_I2C_ALGOPCA=m # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set # CONFIG_I2C_NFORCE2_S4985 is not set +# CONFIG_I2C_INTEL_MID is not set CONFIG_EEPROM_AT24=m CONFIG_EEPROM_LEGACY=m @@ -2156,6 +2161,11 @@ CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP401=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29020=m +CONFIG_ISL29003=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m CONFIG_SENSORS_TSL2550=m CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VIA_CPUTEMP=m @@ -2186,6 +2196,8 @@ CONFIG_SENSORS_LTC4261=m # CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_EMC2103 is not set # CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set # CONFIG_HMC6352 is not set # CONFIG_BMP085 is not set @@ -2328,6 +2340,7 @@ CONFIG_AGP_VIA=y CONFIG_AGP_EFFICEON=y CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_STUB_POULSBO=m CONFIG_DRM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m @@ -2386,7 +2399,8 @@ CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y CONFIG_VIDEO_BWQCAM=m -# CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_CAFE_CCIC=m # CONFIG_VIDEO_CPIA is not set CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_CQCAM=m @@ -2418,6 +2432,7 @@ CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_STRADIS=m CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_W9966=m @@ -2460,6 +2475,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m # # Digital Video Broadcasting Devices @@ -2499,6 +2515,8 @@ CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m +CONFIG_DVB_S5H1432=m +CONFIG_DVB_IX2505V=m CONFIG_DVB_L64781=m CONFIG_DVB_NXT6000=m CONFIG_DVB_MT352=m @@ -2603,6 +2621,7 @@ CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_VP702X=m CONFIG_DVB_USB_VP7045=m CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m CONFIG_DVB_PT1=m @@ -2624,9 +2643,11 @@ CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m CONFIG_IR_JVC_DECODER=m CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m CONFIG_IR_LIRC_CODEC=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m +CONFIG_IR_NUVOTON=m CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set @@ -3078,6 +3099,8 @@ CONFIG_USB_GSPCA_PAC7302=m CONFIG_USB_GSPCA_STV0680=m CONFIG_USB_GL860=m CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SQ930X=m @@ -3093,6 +3116,7 @@ CONFIG_USB_SE401=m CONFIG_USB_ZR364XX=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M001=m CONFIG_SOC_CAMERA_MT9V022=m CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_SOC_CAMERA_MT9M111=m @@ -3102,6 +3126,8 @@ 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_IMX074=m # # USB Network adaptors @@ -3306,6 +3332,7 @@ CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_ISL12022=m CONFIG_MFD_SUPPORT=y +CONFIG_MFD_VX855=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_TC6393XB is not set @@ -3326,6 +3353,7 @@ CONFIG_MFD_WM8400=m # CONFIG_ABX500_CORE is not set # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_WM831X_I2C is not set # # File systems @@ -3462,6 +3490,7 @@ CONFIG_UFS_FS=m # CONFIG_UFS_DEBUG is not set CONFIG_9P_FS=m CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y CONFIG_FUSE_FS=m CONFIG_OMFS_FS=m CONFIG_CUSE=m @@ -3482,6 +3511,7 @@ CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set # CONFIG_NFS_USE_NEW_IDMAPPER is not set +# CONFIG_NFSD_DEPRECATED is not set CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m @@ -4043,6 +4073,8 @@ CONFIG_APM_POWER=m CONFIG_WM831X_POWER=m # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_CHARGER_ISP1704 is not set CONFIG_BATTERY_PMU=m CONFIG_BATTERY_BQ27x00=m CONFIG_BATTERY_MAX17040=m @@ -4107,7 +4139,6 @@ CONFIG_INPUT_APANEL=m # CONFIG_INTEL_MENLOW is not set CONFIG_ENCLOSURE_SERVICES=m -CONFIG_ISL29003=m CONFIG_IPWIRELESS=m CONFIG_RTC_DRV_DS1511=m @@ -4236,6 +4267,13 @@ CONFIG_USB_ATMEL=m # CONFIG_EASYCAP is not set # CONFIG_SOLO6X10 is not set # CONFIG_ACPI_QUICKSTART is not set +# CONFIG_BRCM80211 is not set +# CONFIG_R8712U is not set +# CONFIG_ATH6K_LEGACY is not set +# CONFIG_USB_ENESTORAGE is not set +# CONFIG_BCM_WIMAX is not set +# CONFIG_FT1000 is not set +# CONFIG_SPEAKUP is not set # # Android @@ -4357,7 +4395,9 @@ CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_SCH is not set # CONFIG_GPIO_LANGWELL is not set # CONFIG_GPIO_RDC321X is not set - +# CONFIG_GPIO_BASIC_MMIO is not set +# CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_PCH is not set CONFIG_KSYM_TRACER=y CONFIG_PROFILE_KSYM_TRACER=y @@ -4377,3 +4417,5 @@ CONFIG_IR_STREAMZAP=m CONFIG_SPARSE_RCU_POINTER=y # CONFIG_PM_OPP is not set + +CONFIG_BKL=y |