diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-06-10 08:31:19 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-06-10 08:31:19 -0400 |
| commit | 9b82ecdfb861cd3daf9d01b050c4937391aec003 (patch) | |
| tree | 04c35507c2c3b5cabd7ba2fcb217af3e8285c129 /config-x86-generic | |
| parent | 38d8cd2ec1088b1ea6afe3520826405f20e9adcb (diff) | |
| download | kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.tar.gz kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.tar.xz kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.zip | |
Update to Linux v3.15
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config-x86-generic b/config-x86-generic index f6b3fa8c5..92441b0a7 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -34,6 +34,7 @@ CONFIG_X86_PM_TIMER=y CONFIG_EFI=y CONFIG_EFI_STUB=y +# CONFIG_EFI_MIXED is not set CONFIG_EFI_VARS=y CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE=y @@ -185,9 +186,6 @@ CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_SCHED_MC=y -CONFIG_SND_ISA=y -CONFIG_SND_ES18XX=m - CONFIG_TCG_INFINEON=m CONFIG_HW_RANDOM_INTEL=m @@ -219,6 +217,7 @@ CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_WMI=m CONFIG_ACER_WMI=m CONFIG_ACERHDF=m +CONFIG_ALIENWARE_WMI=m CONFIG_ASUS_WMI=m CONFIG_ASUS_NB_WMI=m CONFIG_HP_WIRELESS=m @@ -439,6 +438,7 @@ CONFIG_RCU_FANOUT_LEAF=16 CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m CONFIG_NFC_MEI_PHY=m CONFIG_NFC_PN544_MEI=m @@ -448,6 +448,7 @@ CONFIG_NFC_MICROREAD_MEI=m # CONFIG_DEBUG_NMI_SELFTEST is not set CONFIG_X86_INTEL_LPSS=y +CONFIG_PWM_LPSS=m CONFIG_PINCTRL=y CONFIG_PINCTRL_BAYTRAIL=y |