diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-14 19:20:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-14 19:20:46 -0400 |
| commit | f7fd1d99d87f11c41cf09f881b1aeb950a3c8e13 (patch) | |
| tree | 95910fb3078e1136e35aaa6d9f0f251cdb4ca1a8 /kernels/linux-libre-xen/config | |
| parent | 09c1bb45d89c78a9fd80c7a500cb29a0908dc668 (diff) | |
| parent | cd640e7ca0a8968edf887d03db8224334f663e84 (diff) | |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'kernels/linux-libre-xen/config')
| -rw-r--r-- | kernels/linux-libre-xen/config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 7d83b8db4..650e28232 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-4 Kernel Configuration +# Linux/x86 3.14.6-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -208,6 +208,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -270,7 +271,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -540,6 +540,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m |