diff options
| -rw-r--r-- | config-generic | 148 | ||||
| -rw-r--r-- | config-ia64-generic | 1 | ||||
| -rw-r--r-- | config-powerpc32-generic | 2 | ||||
| -rw-r--r-- | config-x86-generic | 5 | ||||
| -rw-r--r-- | config-x86_64-generic | 7 |
5 files changed, 77 insertions, 86 deletions
diff --git a/config-generic b/config-generic index 90c589895..92b6ffb5b 100644 --- a/config-generic +++ b/config-generic @@ -139,6 +139,7 @@ CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_CB710=m CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_USHC=m +CONFIG_MMC_VUB300=m CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set @@ -1106,6 +1107,7 @@ CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_SFB=m CONFIG_NET_SCH_MQPRIO=m CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m CONFIG_NET_CLS=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BASIC=m @@ -1452,6 +1454,8 @@ CONFIG_ATH5K=m CONFIG_ATH5K_DEBUG=y # CONFIG_ATH5K_TRACER is not set CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUG is not set CONFIG_ATH9K_DEBUGFS=y CONFIG_ATH9K_HTC=m @@ -1509,6 +1513,7 @@ CONFIG_IWLWIFI=m CONFIG_IWLWIFI_DEBUG=y CONFIG_IWLWIFI_DEBUGFS=y CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y +CONFIG_IWLWIFI_DEVICE_SVTOOL=y # CONFIG_IWL_P2P is not set CONFIG_IWLAGN=m CONFIG_IWLWIFI_LEGACY=m @@ -1543,6 +1548,7 @@ CONFIG_RT2500USB=m CONFIG_RT2800USB=m CONFIG_RT2800USB_RT33XX=y CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800PCI=m CONFIG_RT2800PCI_RT33XX=y @@ -1574,8 +1580,12 @@ CONFIG_WL1271_SDIO=m CONFIG_WL1271_SPI=m CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m CONFIG_RTL8192CU=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m + # # Token Ring devices # @@ -1920,13 +1930,14 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_LM8323 is not set -# FIXME: Do we really need these keyboards enabled ? -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_MAX7359=m +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_ADP5589 is not set +# CONFIG_KEYBOARD_MPR121 is not set # CONFIG_KEYBOARD_QT1070 is not set # CONFIG_KEYBOARD_MCS is not set -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_TCA6416 is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y @@ -2001,6 +2012,7 @@ CONFIG_TOUCHSCREEN_W90X900=m # CONFIG_TOUCHSCREEN_BU21013 is not set CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_ATMEL_MXT=m +# CONFIG_TOUCHSCREEN_MAX11801 is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m @@ -2035,6 +2047,7 @@ CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m CONFIG_N_GSM=m +# CONFIG_TRACE_SINK is not set # CONFIG_STALDRV is not set # CONFIG_IBM_ASM is not set CONFIG_TIFM_CORE=m @@ -2083,6 +2096,7 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_XILINX_PS_UART is not set # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_UNIX98_PTYS=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y @@ -2268,6 +2282,12 @@ CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_EMC6W201=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m @@ -2296,6 +2316,9 @@ CONFIG_W1_SLAVE_DS2433=m CONFIG_W1_SLAVE_DS2433_CRC=y CONFIG_W1_SLAVE_DS2760=m CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_BQ27000=m # # Mice @@ -2397,6 +2420,8 @@ CONFIG_RTC_DRV_WM831X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m CONFIG_DTLK=m CONFIG_R3964=m @@ -2532,6 +2557,7 @@ CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_TLG2300=m # CONFIG_VIDEO_TIMBERDALE is not set +# CONFIG_VIDEO_M5MOLS is not set CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -2563,6 +2589,7 @@ CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18212=m # # Digital Video Broadcasting Devices @@ -2634,6 +2661,8 @@ CONFIG_DVB_ATBM8830=m CONFIG_DVB_TDA665x=m CONFIG_DVB_STV0299=m CONFIG_DVB_MB86A16=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_CXD2820R=m # # Supported Frontend Modules @@ -2742,6 +2771,8 @@ CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m CONFIG_IR_ITE_CIR=m CONFIG_IR_NUVOTON=m +CONFIG_IR_FINTEK=m +CONFIG_IR_REDRAT3=m CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set @@ -2807,6 +2838,7 @@ CONFIG_FB_RIVA=m # CONFIG_FB_RIVA_I2C is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_S3=m +CONFIG_FB_S3_DDC=y CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y CONFIG_FB_SAVAGE_ACCEL=y @@ -2824,11 +2856,13 @@ CONFIG_FB_VOODOO1=m # CONFIG_FB_VT8623 is not set CONFIG_FB_EFI=y CONFIG_FB_VIA=m +CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_VIA_DIRECT_PROCFS is not set CONFIG_FB_METRONOME=m CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_LIME=y +CONFIG_FB_MB862XX_I2C=y # CONFIG_FB_PRE_INIT_FB is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_BROADSHEET is not set @@ -2939,6 +2973,7 @@ CONFIG_SND_ENS1371=m CONFIG_SND_ES1938=m CONFIG_SND_ES1968=m CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_CTXFI=m @@ -2996,6 +3031,7 @@ CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m CONFIG_SND_ASIHPI=m +CONFIG_SND_LOLA=m # # ALSA USB devices @@ -3018,6 +3054,7 @@ CONFIG_SND_PDAUDIOCF=m CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m # # Open Sound System @@ -3051,6 +3088,8 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_HCD_SSB is not set CONFIG_USB_UHCI_HCD=y +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_HCD_ISO=y # CONFIG_USB_SL811_CS is not set # CONFIG_USB_R8A66597_HCD is not set CONFIG_USB_XHCI_HCD=m @@ -3213,6 +3252,7 @@ CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SQ930X=m CONFIG_USB_GSPCA_NW80X=m CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_KINECT=m CONFIG_USB_IBMCAM=m CONFIG_USB_KONICAWC=m @@ -3403,7 +3443,6 @@ CONFIG_USB_PWC_INPUT_EVDEV=y # CONFIG_USB_PWC_DEBUG is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_QUICKCAM_MESSENGER is not set -CONFIG_USB_SL811_HCD=m CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y CONFIG_RADIO_SI470X=y @@ -3443,7 +3482,6 @@ CONFIG_PCF50633_GPIO=m # CONFIG_AB3100_CORE is not set CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_CHARGER_PCF50633=m CONFIG_RTC_DRV_PCF50633=m CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_ISL12022=m @@ -3632,6 +3670,7 @@ 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_PNFS_OBJLAYOUT=m CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y @@ -3654,6 +3693,7 @@ CONFIG_CIFS_ACL=y CONFIG_CIFS_WEAK_PW_HASH=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_NFSD_EXPORT=y CONFIG_NCP_FS=m CONFIG_NCPFS_PACKET_SIGNING=y CONFIG_NCPFS_IOCTL_LOCKING=y @@ -4205,13 +4245,15 @@ CONFIG_APM_POWER=m # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_BATTERY_DS2780 is not set # CONFIG_CHARGER_ISP1704 is not set -CONFIG_BATTERY_PMU=m +# CONFIG_CHARGER_MAX8903 is not set # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_PDA_POWER is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set CONFIG_AUXDISPLAY=y @@ -4324,7 +4366,6 @@ CONFIG_PHONET=m CONFIG_ICS932S401=m # CONFIG_C2PORT is not set -CONFIG_W1_SLAVE_BQ27000=m CONFIG_IT87_WDT=m @@ -4417,6 +4458,11 @@ CONFIG_USB_ATMEL=m # CONFIG_DRM_PSB is not set # CONFIG_ALTERA_STAPL is not set # CONFIG_DVB_CXD2099 is not set +# CONFIG_USBIP_CORE is not set +# CONFIG_BRCMSMAC is not set +# CONFIG_BRCMFMAC is not set +# CONFIG_INTEL_MEI is not set +# CONFIG_ZCACHE is not set # # Android @@ -4482,6 +4528,8 @@ CONFIG_PPS_CLIENT_PARPORT=m CONFIG_PPS_GENERATOR_PARPORT=m CONFIG_NTP_PPS=y +CONFIG_PTP_1588_CLOCK=m + # CONFIG_USB_SERIAL_QUATECH2 is not set # CONFIG_VT6655 is not set CONFIG_FB_UDL=m @@ -4519,6 +4567,7 @@ CONFIG_ATOMIC64_SELFTEST=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m +CONFIG_CLEANCACHE=y CONFIG_BLK_DEV_DRBD=m @@ -4586,6 +4635,7 @@ CONFIG_LOOPBACK_TARGET=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m +CONFIG_TCM_FC=m CONFIG_HWSPINLOCK=m @@ -4599,88 +4649,14 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_TEST_KSTRTOX=m -CONFIG_CLEANCACHE=m -CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_NET_SCH_QFQ=m -CONFIG_BPF_JIT=m -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_INTEL_MID_PTI=m -CONFIG_TCM_FC=m -CONFIG_ATH9K_PCI=m -CONFIG_ATH9K_AHB=m -CONFIG_IWLWIFI_DEVICE_SVTOOL=m -CONFIG_RT2800USB_RT53XX=m -CONFIG_RTL8192SE=m -CONFIG_MWIFIEX=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_TOUCHSCREEN_MAX11801=m -CONFIG_TRACE_SINK=m -CONFIG_SERIAL_XILINX_PS_UART=m -CONFIG_PTP_1588_CLOCK=m -CONFIG_W1_SLAVE_DS2408=m -CONFIG_W1_SLAVE_DS2780=m -CONFIG_BATTERY_DS2780=m -CONFIG_CHARGER_MAX8903=m -CONFIG_SENSORS_FAM15H_POWER=m -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_ADM1275=m -CONFIG_SENSORS_UCD9000=m -CONFIG_SENSORS_UCD9200=m -CONFIG_SENSORS_EMC6W201=m -CONFIG_SENSORS_ACPI_POWER=m CONFIG_BCMA=m -CONFIG_IR_FINTEK=m -CONFIG_IR_REDRAT3=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_CXD2820R=m -CONFIG_FB_S3_DDC=m -CONFIG_FB_VIA_X_COMPATIBILITY=m -CONFIG_FB_MB862XX_I2C=m -CONFIG_SND_ES1968_RADIO=m -CONFIG_SND_LOLA=m -CONFIG_SND_ISIGHT=m -CONFIG_USB_SL811_HCD_ISO=m -CONFIG_MMC_VUB300=m -CONFIG_RTC_DRV_EM3027=m -CONFIG_RTC_DRV_RV3029C2=m -CONFIG_USBIP_CORE=m -CONFIG_BRCMSMAC=m -CONFIG_BRCMFMAC=m -CONFIG_INTEL_MEI=m -CONFIG_INTEL_OAKTRAIL=m -CONFIG_GOOGLE_FIRMWARE=m -CONFIG_PNFS_OBJLAYOUT=m -CONFIG_CIFS_NFSD_EXPORT=m - -CONFIG_CLEANCACHE=y -# CONFIG_BPF_JIT is not set -CONFIG_ATH9K_PCI=y -CONFIG_ATH9K_AHB=y -CONFIG_IWLWIFI_DEVICE_SVTOOL=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_MWIFIEX_SDIO=y -CONFIG_TRACE_ROUTER=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_DEBUG is not set -# CONFIG_FB_S3_DDC is not set -# CONFIG_FB_VIA_X_COMPATIBILITY is not set -# CONFIG_FB_MB862XX_I2C is not set -CONFIG_SND_ES1968_RADIO=y -CONFIG_USB_SL811_HCD_ISO=y -CONFIG_USBIP_VHCI_HCD=y -CONFIG_USBIP_HOST=y -# CONFIG_USBIP_DEBUG is not set -# CONFIG_BRCMDBG is not set -# CONFIG_GOOGLE_FIRMWARE is not set -CONFIG_CIFS_NFSD_EXPORT=y + # CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set # CONFIG_RCU_CPU_STALL_TIMEOUT is not set -# CONFIG_ZCACHE is not set +# CONFIG_GOOGLE_FIRMWARE is not set +CONFIG_INTEL_MID_PTI=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 diff --git a/config-ia64-generic b/config-ia64-generic index 5cc5091c0..8f08564a9 100644 --- a/config-ia64-generic +++ b/config-ia64-generic @@ -140,6 +140,7 @@ CONFIG_ACPI_VIDEO=m CONFIG_ACPI_HED=m CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_IPMI=m +CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_PM=y CONFIG_HOTPLUG_PCI=y diff --git a/config-powerpc32-generic b/config-powerpc32-generic index 07c060cf1..31c399e65 100644 --- a/config-powerpc32-generic +++ b/config-powerpc32-generic @@ -183,3 +183,5 @@ CONFIG_EVENT_PROFILE=y CONFIG_KVM_BOOK3S_32=m # CONFIG_SCSI_QLA_ISCSI is not set + +CONFIG_BATTERY_PMU=m diff --git a/config-x86-generic b/config-x86-generic index f8ccad801..7d6b72ba5 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -156,6 +156,7 @@ CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_GHES=m # CONFIG_ACPI_APEI_EINJ is not set CONFIG_ACPI_IPMI=m +CONFIG_ACPI_CUSTOM_METHOD=m # # CPUFreq processor drivers @@ -329,6 +330,7 @@ CONFIG_DELL_WMI_AIO=m CONFIG_ASUS_WMI=m CONFIG_ASUS_NB_WMI=m CONFIG_XO15_EBOOK=m +CONFIG_INTEL_OAKTRAIL=m # CONFIG_TOUCHSCREEN_INTEL_MID is not set @@ -384,6 +386,7 @@ CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_XENFS=m CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_BACKEND=y +CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_DEBUG_FS=y CONFIG_XEN_PLATFORM_PCI=m CONFIG_XEN_GNTDEV=m @@ -419,6 +422,8 @@ CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ACPI_POWER=m # CONFIG_CPA_DEBUG is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set diff --git a/config-x86_64-generic b/config-x86_64-generic index cc757f16f..cd12bc537 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -102,6 +102,7 @@ CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_GHES=m # CONFIG_ACPI_APEI_EINJ is not set CONFIG_ACPI_IPMI=m +CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ASUS_LAPTOP=m @@ -123,6 +124,7 @@ CONFIG_DELL_WMI_AIO=m CONFIG_ASUS_WMI=m CONFIG_ASUS_NB_WMI=m # CONFIG_XO15_EBOOK is not set +CONFIG_INTEL_OAKTRAIL=m # CONFIG_INTEL_SCU_IPC is not set @@ -321,6 +323,7 @@ CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_BACKEND=y +CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_GNTDEV=m CONFIG_XEN_DEBUG_FS=y CONFIG_XEN_PLATFORM_PCI=m @@ -330,6 +333,8 @@ CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ACPI_POWER=m # CONFIG_COMPAT_VDSO is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y @@ -466,3 +471,5 @@ CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_HP_ACCEL=m # CONFIG_RAPIDIO is not set + +CONFIG_BPF_JIT=y |