From 9fec004526d575f012674b5d60b69e987c4af219 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 29 Sep 2017 20:34:38 +0200 Subject: [PATCH] [armel] rtc: Disable RTC_NVMEM and explicitly enable it for every other configuration. --- debian/changelog | 1 + debian/config/armel/config.marvell | 1 + debian/config/config | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8ca9e4b0652d..d0bb35e76203 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium * thp: Enable TRANSPARENT_HUGEPAGE_ALWAYS instead of TRANSPARENT_HUGEPAGE_MADVISE * ALSA: Enable SND_OSSEMUL, a new dependency of SND_{MIXER,PCM}_OSS + * [armel] rtc: Disable RTC_NVMEM [ Uwe Kleine-König ] * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell index d53a4b5f5421..bc6ca410a3d6 100644 --- a/debian/config/armel/config.marvell +++ b/debian/config/armel/config.marvell @@ -542,6 +542,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y ## ## file: drivers/rtc/Kconfig ## +# CONFIG_RTC_NVMEM is not set CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_PCF8563=m diff --git a/debian/config/config b/debian/config/config index 5f5bd75805cc..31ce57602074 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4140,6 +4140,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_SYSTOHC=y CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set +CONFIG_RTC_NVMEM=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y