[linux] 01/01: Change MFD_MAX77686 and RTC_DRV_MAX77686 from module to built-in

[debian-kernel at lists.debian.org]

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

rosh-guest pushed a commit to branch sid
in repository linux.

commit 59fd45aa71c13b36bcd30ab17ea8dceb514ee2f4
Author: Roger Shimizu <rogershimizu at gmail.com>
Date:   Sun May 29 17:48:01 2016 +0900

    Change MFD_MAX77686 and RTC_DRV_MAX77686 from module to built-in
    
    So far all RTC drivers enabled are built-in
---
 debian/changelog                 | 8 ++++----
 debian/config/armhf/config.armmp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87182c6..e97566c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -99,10 +99,10 @@ linux (4.5.5-1) UNRELEASED; urgency=medium
   [ Roger Shimizu ]
   * armhf: Enable SENSORS_PWM_FAN / PWM_SAMSUNG as module, as recommended by
     Steinar H. Gunderson. (Closes: #824941)
-  * armhf: For Odroid-U3 (Exynos4) support, enable ARCH_EXYNOS4 as built-in,
-    and COMMON_CLK_MAX77686 / MFD_MAX77686 / REGULATOR_MAX77686
-    / RTC_DRV_MAX77686 / MMC_SDHCI_S3C as module. Thanks to Vagrant Cascadian.
-    (Closes: #825139)
+  * armhf: For Odroid-U3 (Exynos4) support, enable ARCH_EXYNOS4 / MFD_MAX77686
+    / RTC_DRV_MAX77686 as built-in, and COMMON_CLK_MAX77686
+    / REGULATOR_MAX77686 / MMC_SDHCI_S3C as module. Thanks to
+    Vagrant Cascadian. (Closes: #825139)
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 21 May 2016 16:47:59 +0200
 
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index d72efda..60b05dd 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -526,7 +526,7 @@ CONFIG_MFD_AS3722=y
 CONFIG_MFD_AXP20X=y
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9052_I2C=y
-CONFIG_MFD_MAX77686=m
+CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_MFD_SEC_CORE=y
@@ -902,7 +902,7 @@ CONFIG_RTC_DRV_S5M=y
 CONFIG_RTC_DRV_DA9052=y
 CONFIG_RTC_DRV_IMXDI=y
 CONFIG_RTC_DRV_OMAP=y
-CONFIG_RTC_DRV_MAX77686=m
+CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_VT8500=y

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