summaryrefslogtreecommitdiff
path: root/libre/linux-libre-grsec/config.i686
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-12-23 04:29:59 -0200
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-12-23 04:29:59 -0200
commiteca20366df90a363ca44d436ebd8c4c881774063 (patch)
tree45a1b8df0c85c7783dc2cc349d0cf5268718b94b /libre/linux-libre-grsec/config.i686
parent8cf8a53fe020f06efcef814bb6e2960a03e3a849 (diff)
parent7b6e08004392409f37fb28e2cd0f67e55a73e3b9 (diff)
downloadabslibre-eca20366df90a363ca44d436ebd8c4c881774063.tar.gz
abslibre-eca20366df90a363ca44d436ebd8c4c881774063.tar.bz2
abslibre-eca20366df90a363ca44d436ebd8c4c881774063.zip
Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre/abslibre
Diffstat (limited to 'libre/linux-libre-grsec/config.i686')
-rw-r--r--libre/linux-libre-grsec/config.i6865
1 files changed, 1 insertions, 4 deletions
diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686
index 3cbd6f4b4..51c3630d7 100644
--- a/libre/linux-libre-grsec/config.i686
+++ b/libre/linux-libre-grsec/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.17.1-gnu-201410192051-1-grsec Kernel Configuration
+# Linux/x86 3.17.7-gnu-201412211910-1-grsec Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -420,8 +420,6 @@ CONFIG_X86_MCE_THRESHOLD=y
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_THERMAL_VECTOR=y
CONFIG_VM86=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
CONFIG_X86_REBOOTFIXUPS=y
@@ -5523,7 +5521,6 @@ CONFIG_RTC_DRV_DS1511=m
CONFIG_RTC_DRV_DS1553=m
CONFIG_RTC_DRV_DS1742=m
CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_EFI=m
CONFIG_RTC_DRV_STK17TA8=m
CONFIG_RTC_DRV_M48T86=m
CONFIG_RTC_DRV_M48T35=m