diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-09-13 10:52:15 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-09-13 10:52:15 -0700 |
| commit | a18b5849611abfbf56f60e5893d73231947763b6 (patch) | |
| tree | 2273319ad51136eb725d5f7cd526ba57d0c1aa10 /config-x86-generic | |
| parent | 0557a6fc2da5a17f8a88e164e7b40212db4ab9dd (diff) | |
| parent | 9d990eb71697daaefad6fea6c49be6492ad02a0e (diff) | |
| download | kernel-a18b5849611abfbf56f60e5893d73231947763b6.tar.gz kernel-a18b5849611abfbf56f60e5893d73231947763b6.tar.xz kernel-a18b5849611abfbf56f60e5893d73231947763b6.zip | |
Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
3.17 merge.
Conflicts:
Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
config-armv7
config-armv7-generic
config-armv7-lpae
config-nodebug
kernel-arm64.patch
kernel.spec
secure-modules.patch
sources
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index 4e2ab7f9a..2681892b1 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -119,6 +119,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_CCP=y CONFIG_CRYPTO_DEV_CCP_DD=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_GENERIC_ISA_DMA=y @@ -142,6 +143,9 @@ CONFIG_IPW2200_QOS=y CONFIG_BLK_DEV_AMD74XX=y +# I2C_ACPI casues I2C to be built in. This should probably be fixed. +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m @@ -183,6 +187,7 @@ CONFIG_EDAC_X38=m CONFIG_EDAC_MCE_INJ=m CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_LEGACY_SYSFS=y +CONFIG_EDAC_IE31200=m CONFIG_SCHED_MC=y @@ -404,7 +409,7 @@ CONFIG_SP5100_TCO=m # CONFIG_MEMTEST is not set # CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_MAXSMP is not set +CONFIG_MAXSMP=y CONFIG_HP_ILO=m @@ -437,6 +442,7 @@ CONFIG_X86_DECODER_SELFTEST=y CONFIG_ACPI_CMPC=m CONFIG_MSI_WMI=m CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_TOSHIBA_HAPS=m CONFIG_VGA_SWITCHEROO=y CONFIG_LPC_SCH=m @@ -447,6 +453,33 @@ CONFIG_GPIO_ICH=m # CONFIG_GPIO_MCP23S08 is not set # CONFIG_GPIO_F7188X is not set +# These should all go away with IC2_ACPI is fixed +# CONFIG_MFD_AS3711 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_AXP20X is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77686 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_SEC_CORE is not set +# CONFIG_MFD_SMSC is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set + CONFIG_PCI_CNB20LE_QUIRK=y @@ -537,6 +570,9 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_XZ_DEC_X86=y CONFIG_MPILIB=y +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +CONFIG_SIGNED_PE_FILE_VERIFICATION=y CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_MODULE_SIG=y @@ -547,6 +583,9 @@ CONFIG_MODULE_SIG_SHA256=y CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y CONFIG_EFI_SIGNATURE_LIST_PARSER=y +# CONFIG_KEXEC_FILE is not set +# CONFIG_KEXEC_VERIFY_SIG is not set + CONFIG_MODULE_SIG_UEFI=y CONFIG_VMXNET3=m |