diff options
author | Aurelien Desbrieres <aurelien@hackers.camp> | 2014-12-23 13:47:42 +0100 |
---|---|---|
committer | Aurelien Desbrieres <aurelien@hackers.camp> | 2014-12-23 13:47:42 +0100 |
commit | 8cf6435df66cddde802b11efd56b21f1c7798eee (patch) | |
tree | 2923b09a9526a326d1b615323d5cc9b0e6516f92 /libre/linux-libre-grsec/config.i686 | |
parent | 4faab6023dc99497750eab7e770d2c2210b7e740 (diff) | |
parent | 7b6e08004392409f37fb28e2cd0f67e55a73e3b9 (diff) |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/~git/abslibre
Diffstat (limited to 'libre/linux-libre-grsec/config.i686')
-rw-r--r-- | libre/linux-libre-grsec/config.i686 | 5 |
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 |