diff options
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 50 |
1 files changed, 39 insertions, 11 deletions
diff --git a/config-generic b/config-generic index 7b5630f2f..e00002edf 100644 --- a/config-generic +++ b/config-generic @@ -1434,11 +1434,12 @@ CONFIG_ATMEL=m CONFIG_B43=m CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -# CONFIG_B43_DEBUG is not set +CONFIG_B43_DEBUG=y CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_N=y # CONFIG_B43_FORCE_PIO is not set CONFIG_B43LEGACY=m -# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -1503,12 +1504,12 @@ CONFIG_RT2500PCI=m CONFIG_RT61PCI=m CONFIG_RT2500USB=m CONFIG_RT2800USB=m -# CONFIG_RT2800USB_RT30XX is not set -# CONFIG_RT2800USB_RT35XX is not set -# CONFIG_RT2800USB_UNKNOWN is not set +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800PCI=m -# CONFIG_RT2800PCI_RT30XX is not set -# CONFIG_RT2800PCI_RT35XX is not set +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y CONFIG_RT73USB=m CONFIG_RTL8180=m CONFIG_RTL8187=m @@ -1520,7 +1521,13 @@ CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_AR9170_USB=m -CONFIG_WL12XX=y +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +# CONFIG_WL12XX_HT is not set +CONFIG_WL12XX_SPI=m +CONFIG_WL12XX_SDIO=m +# CONFIG_WL12XX_SDIO_TEST is not set + CONFIG_WL1251=m CONFIG_WL1251_SPI=m CONFIG_WL1251_SDIO=m @@ -1528,6 +1535,8 @@ CONFIG_WL1271=m CONFIG_WL1271_SDIO=m CONFIG_WL1271_SPI=m +CONFIG_RTL8192CE=m + # # Token Ring devices # @@ -1583,7 +1592,8 @@ CONFIG_CAN_ESD_USB2=m CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_PLX_PCI=m CONFIG_CAN_TSCAN1=m -CONFIG_PCH_CAN=m +CONFIG_CAN_SLCAN=m +# CONFIG_PCH_CAN is not set CONFIG_NETROM=m CONFIG_ROSE=m CONFIG_MKISS=m @@ -1832,6 +1842,8 @@ CONFIG_INPUT_CM109=m CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_ADXL34X is not set +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m # # Input I/O drivers @@ -1941,6 +1953,7 @@ CONFIG_TOUCHSCREEN_USB_COMPOSITE=m # CONFIG_TOUCHSCREEN_WM97XX is not set CONFIG_TOUCHSCREEN_W90X900=m # CONFIG_TOUCHSCREEN_BU21013 is not set +CONFIG_TOUCHSCREEN_ST1232=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m @@ -2202,6 +2215,7 @@ CONFIG_SENSORS_W83795=m # CONFIG_HMC6352 is not set # CONFIG_BMP085 is not set # CONFIG_PCH_PHUB is not set +# CONFIG_SERIAL_PCH_UART is not set CONFIG_W1=m CONFIG_W1_CON=y @@ -2418,6 +2432,7 @@ CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_IVTV=m @@ -2447,6 +2462,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_TLG2300=m +# CONFIG_VIDEO_TIMBERDALE is not set CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -2457,6 +2473,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_RADIO_GEMTEK_PCI=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAESTRO=m +CONFIG_RADIO_WL1273=m CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER_CUSTOMISE=y @@ -2573,6 +2590,7 @@ CONFIG_DVB_LGS8GL5=m CONFIG_DVB_DUMMY_FE=m CONFIG_DVB_FIREDTV=m CONFIG_DVB_NGENE=m +CONFIG_DVB_MB86A20S=m # # Supported SAA7146 based PCI Adapters @@ -2637,6 +2655,8 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_RC_CORE=m +CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m @@ -3127,6 +3147,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m CONFIG_SOC_CAMERA_OV9640=m CONFIG_SOC_CAMERA_OV6650=m CONFIG_SOC_CAMERA_IMX074=m +CONFIG_SOC_CAMERA_OV2640=m # # USB Network adaptors @@ -3148,6 +3169,7 @@ CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m CONFIG_USB_NET_ZAURUS=m CONFIG_USB_NET_CX82310_ETH=m CONFIG_USB_NET_INT51X1=m @@ -3801,6 +3823,7 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y +# CONFIG_SCHED_AUTOGROUP is not set CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y @@ -3842,7 +3865,7 @@ CONFIG_IBMASR=m CONFIG_PM_DEBUG=y CONFIG_PM_TRACE=y # CONFIG_PM_VERBOSE is not set -# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_TEST_SUSPEND=y CONFIG_PM_RUNTIME=y ## BEGIN ISA Junk. @@ -4289,7 +4312,7 @@ CONFIG_USB_ATMEL=m # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set -# CONFIG_BOOT_TRACER is not set +CONFIG_BOOT_TRACER=y CONFIG_EARLY_PRINTK_DBGP=y CONFIG_SECURITYFS=y @@ -4322,6 +4345,7 @@ CONFIG_STRIP_ASM_SYMS=y # CONFIG_RCU_FANOUT_EXACT is not set CONFIG_RCU_FAST_NO_HZ=y +CONFIG_SRCU_SYNCHRONIZE_DELAY=10 CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 @@ -4415,14 +4439,18 @@ CONFIG_KPROBE_EVENT=y CONFIG_IR_CORE=m CONFIG_IR_ENE=m CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m # CONFIG_GPIO_SX150X is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_MAX8998 is not set # CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TC3589X is not set CONFIG_SPARSE_RCU_POINTER=y # CONFIG_PM_OPP is not set CONFIG_BKL=y + +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y |