diff options
author | Tom Nguyen | 2017-08-06 22:00:31 +0700 |
---|---|---|
committer | Tom Nguyen | 2017-08-06 22:00:31 +0700 |
commit | 3a44a6bd508a4564b4c5b805df00b03583c72df3 (patch) | |
tree | 4272c39f399f3fa0610c7eb231d08087e4682861 /config.i686 | |
parent | 0d45a9cd72eec0237ee6c551222bd9432b8694ae (diff) | |
download | aur-3a44a6bd508a4564b4c5b805df00b03583c72df3.tar.gz |
reworked merge patches
Diffstat (limited to 'config.i686')
-rw-r--r-- | config.i686 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config.i686 b/config.i686 index d9bb8d012b4f..91b1198d7e01 100644 --- a/config.i686 +++ b/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.12.0-1 Kernel Configuration +# Linux/x86 4.12.4-8 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -81,7 +81,9 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_MSI_IRQ=y @@ -89,6 +91,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y @@ -2000,7 +2003,6 @@ CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m CONFIG_NVME_CORE=m CONFIG_BLK_DEV_NVME=m -# CONFIG_BLK_DEV_NVME_SCSI is not set CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m |