diff options
author | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
commit | 65542a8852759f35e19959149ac92297c8b54be5 (patch) | |
tree | bc8f398c7b10a4725b20aa59ab1452d30f358ea3 /gnu/packages/aux-files | |
parent | bc60349b5bc58a0b803df5adce1de6db82453744 (diff) | |
parent | f66aee3d0d2f573187ed5d44ae7c13d73cd4097a (diff) | |
download | patches-65542a8852759f35e19959149ac92297c8b54be5.tar patches-65542a8852759f35e19959149ac92297c8b54be5.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/aux-files')
-rw-r--r-- | gnu/packages/aux-files/chromium/master-preferences.json | 3 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/5.2-arm64.conf | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/gnu/packages/aux-files/chromium/master-preferences.json b/gnu/packages/aux-files/chromium/master-preferences.json index 5a2049fa72..df68804d5a 100644 --- a/gnu/packages/aux-files/chromium/master-preferences.json +++ b/gnu/packages/aux-files/chromium/master-preferences.json @@ -17,9 +17,6 @@ "alternate_error_pages": { "enabled": false }, - "hardware": { - "audio_capture_enabled": false - }, "default_apps": "noinstall", "hide_web_store_icon": true, "homepage": "https://www.gnu.org/software/guix/" diff --git a/gnu/packages/aux-files/linux-libre/5.2-arm64.conf b/gnu/packages/aux-files/linux-libre/5.2-arm64.conf index bfd8c18ddb..4ad652a78f 100644 --- a/gnu/packages/aux-files/linux-libre/5.2-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.2-arm64.conf @@ -8023,7 +8023,7 @@ CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=m +CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y |