From 1872899eaafcf6f13f0de1bef5ed0af371b1b5d5 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Wed, 30 Nov 2016 20:38:04 +0300 Subject: [PATCH] Update pine64-dev and marvell-next kernel configs --- config/kernel/linux-marvell-next.config | 4 ++-- config/kernel/linux-pine64-dev.config | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/kernel/linux-marvell-next.config b/config/kernel/linux-marvell-next.config index f00c58e62c..3ee50b5383 100644 --- a/config/kernel/linux-marvell-next.config +++ b/config/kernel/linux-marvell-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.8.9 Kernel Configuration +# Linux/arm 4.8.11 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -2027,7 +2027,7 @@ CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_MARVELL=y CONFIG_MV643XX_ETH=y CONFIG_MVMDIO=y -CONFIG_MVNETA_BM_ENABLE=m +CONFIG_MVNETA_BM_ENABLE=y CONFIG_MVNETA=y CONFIG_MVNETA_BM=y CONFIG_MVPP2=y diff --git a/config/kernel/linux-pine64-dev.config b/config/kernel/linux-pine64-dev.config index 6c35dfb28c..e71a729aa3 100644 --- a/config/kernel/linux-pine64-dev.config +++ b/config/kernel/linux-pine64-dev.config @@ -3310,8 +3310,7 @@ CONFIG_EDAC_SUPPORT=y # CONFIG_EDAC is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_HCTOSYS is not set CONFIG_RTC_SYSTOHC=y CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set @@ -4264,7 +4263,6 @@ CONFIG_INTEGRITY=y CONFIG_INTEGRITY_AUDIT=y # CONFIG_IMA is not set # CONFIG_EVM is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=y