diff options
| author | shackra <elcorreo@deshackra.com> | 2014-05-18 23:19:29 -0600 |
|---|---|---|
| committer | shackra <elcorreo@deshackra.com> | 2014-05-18 23:19:29 -0600 |
| commit | 113793e5d19301552423a95947efc704424a7167 (patch) | |
| tree | c1804e43e11d5f9a152436b42a7ce182e88d500b /libre/linux-libre/config.x86_64 | |
| parent | 01011325d60e0262ba0d5a51c4d3b2be57f5924c (diff) | |
| parent | 1287ab2629ed3997b6ec6e603847eafb1e6aa199 (diff) | |
| download | abslibre-113793e5d19301552423a95947efc704424a7167.tar.gz abslibre-113793e5d19301552423a95947efc704424a7167.tar.bz2 abslibre-113793e5d19301552423a95947efc704424a7167.zip | |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre/config.x86_64')
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index f111c0b2d..1a32c7bf7 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -261,8 +261,8 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set -CONFIG_CC_STACKPROTECTOR_REGULAR=y -# CONFIG_CC_STACKPROTECTOR_STRONG is not set +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -1481,7 +1481,8 @@ CONFIG_DMA_SHARED_BUFFER=y # # Bus devices # -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=m @@ -1637,7 +1638,7 @@ CONFIG_BLK_DEV_DAC960=m # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set |