aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-03-22 11:58:56 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-03-22 11:58:56 +0000
commitd46c499a88823ade80deda68b77d4c2c705bcf14 (patch)
tree622d742ce2a82167541e23d4aaab993600858a2b
parent92871bb01806718a347c41782b5e84d14367a88f (diff)
downloadaports-d46c499a88823ade80deda68b77d4c2c705bcf14.tar.bz2
aports-d46c499a88823ade80deda68b77d4c2c705bcf14.tar.xz
main/linux-vanilla: fix armhf config
-rw-r--r--main/linux-vanilla/APKBUILD2
-rw-r--r--main/linux-vanilla/config-vanilla.armhf5
2 files changed, 4 insertions, 3 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 9c45c27158..b2953a1025 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -223,7 +223,7 @@ _dev() {
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782 0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
19f9ba6dea142b531e21b79389c498e8c07e8bf617c3fff09830a37e7a16c01baa050c8740400eb00539a8f17f9b210e8bc8e4c43051fd8e19dca16d9b82152e config-vanilla.aarch64
-a401a5c5c5e2785f373707620c18fdd74dbfe10e4e934803451a3208e99c72970f35527875e31dd78d4b82b6f77de21361cd432ffc296251737508eb545f451a config-vanilla.armhf
+282834173b1429cc8ff725978da5cb4eb595d8c31fc773ef2e5002de792591bd4aa0ae188b6f2a6f537b69a6d94e2e52776d6bf591fdabab4c80613d8d859c1c config-vanilla.armhf
34198a6830d64b5ec685452a5880e3c7090da18857b1ce600c8c07932b5ee43b3ca68d0bdfeb6b080fef865a6eaa08bb48bfa8c6430a84b975d3e1282269fbd3 config-vanilla.x86
0c3266989eefc8ea919f7ad7746c3d1c9ae3eb7397a82f4f867f4ef572830fe5f1eac32653e5c9081823c3ec707829e0e3836ff5f5040831d055d810ae30083d config-vanilla.x86_64
03a14f009996319fc24fc1a4eae26e250f7cf6213bcdce0f82c3d0b4b54b81517f55e0445df0460d30f6b61f22519f04ac219ce3017c7cf72acd14c43e781a8b config-vanilla.ppc
diff --git a/main/linux-vanilla/config-vanilla.armhf b/main/linux-vanilla/config-vanilla.armhf
index 7d256aba59..a8bf369eed 100644
--- a/main/linux-vanilla/config-vanilla.armhf
+++ b/main/linux-vanilla/config-vanilla.armhf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.13 Kernel Configuration
+# Linux/arm 4.14.28 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -3942,6 +3942,7 @@ CONFIG_DRM_I2C_ADV7511=m
# CONFIG_DRM_STI is not set
# CONFIG_DRM_IMX is not set
CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
# CONFIG_DRM_ARCPGU is not set
# CONFIG_DRM_MXSFB is not set
@@ -6077,6 +6078,7 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
+CONFIG_AUDIT_GENERIC=y
# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
@@ -6127,7 +6129,6 @@ CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
-CONFIG_FONT_AUTOSELECT=y
# CONFIG_SG_SPLIT is not set
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y