diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-11 07:20:04 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-11 07:20:04 +0000 |
| commit | ddbc0abff37606835aa54dbad4654a924d6c9803 (patch) | |
| tree | 55ae520b66bdeefa149ae510cdff0198bf9c271a /main/linux-grsec/kernelconfig.x86_64 | |
| parent | 206e25137a92251db553e6e6c3dd80fd8eb70427 (diff) | |
| download | aports-ddbc0abff37606835aa54dbad4654a924d6c9803.tar.bz2 aports-ddbc0abff37606835aa54dbad4654a924d6c9803.tar.xz | |
main/linux-grsec: upgrade to 3.14.6
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86_64')
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86_64 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index b966e1ab02..1efcdffe07 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.4 Kernel Configuration +# Linux/x86 3.14.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -208,6 +208,7 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB=y # CONFIG_SLOB is not set CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set @@ -268,7 +269,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y @@ -494,6 +494,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 @@ -4444,7 +4445,7 @@ CONFIG_USB_WUSB_CBAF=m # CONFIG_USB_C67X00_HCD=m CONFIG_USB_XHCI_HCD=m -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m # CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_USB_EHCI_TT_NEWSCHED is not set CONFIG_USB_EHCI_PCI=m |