[linux] 02/18: [armel] rtc: Disable RTC_NVMEM

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 9fec004526d575f012674b5d60b69e987c4af219
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Sep 29 20:34:38 2017 +0200

    [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 8ca9e4b..d0bb35e 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 d53a4b5..bc6ca41 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 5f5bd75..31ce576 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git