diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-12 07:31:20 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-12 07:33:10 +0000 |
commit | 15a93a9c732bd02b5b2fda7e20ffdeb4f7317f32 (patch) | |
tree | 34d37c9b5cdf82b0075da904b012bc88c4bd742d /main/linux-vanilla/kernelconfig.x86_64 | |
parent | a22e248e43d078e824390ce71cf73a52bac75aad (diff) | |
download | aports-15a93a9c732bd02b5b2fda7e20ffdeb4f7317f32.tar.bz2 aports-15a93a9c732bd02b5b2fda7e20ffdeb4f7317f32.tar.xz |
main/linux-vanilla: upgrade to 3.14.6
Diffstat (limited to 'main/linux-vanilla/kernelconfig.x86_64')
-rw-r--r-- | main/linux-vanilla/kernelconfig.x86_64 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/linux-vanilla/kernelconfig.x86_64 b/main/linux-vanilla/kernelconfig.x86_64 index 729e48d367..b197afff5c 100644 --- a/main/linux-vanilla/kernelconfig.x86_64 +++ b/main/linux-vanilla/kernelconfig.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.5 Kernel Configuration +# Linux/x86 3.14.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -498,6 +498,7 @@ CONFIG_PM=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=y CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m |