[linux] 01/01: [armel/kirkwood] power/reset: Re-enable POWER_RESET, POWER_RESET_GPIO

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch sid
in repository linux.

commit 19216c6aaa45592c3192b04f3c9bd61ed93a7a24
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Jan 14 01:48:51 2016 +0000

    [armel/kirkwood] power/reset: Re-enable POWER_RESET, POWER_RESET_GPIO
    
    These used to be selected by ARCH_KIRKWOOD_DT, but that was removed in
    3.17-rc1 and we didn't notice the loss of these.
---
 debian/changelog                    | 2 ++
 debian/config/armel/config.kirkwood | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 73a5770..2c26c5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ linux (4.3.3-6) UNRELEASED; urgency=medium
   * gpio: Enable GPIO_SYSFS wherever GPIOLIB is enabled (Closes: #810085)
   * [armhf] udeb: Include usbhid in input-modules (Closes: #809521)
   * linux-image-dbg: Include debugging symbols for VDSOs
+  * [armel/kirkwood] power/reset: Re-enable POWER_RESET, POWER_RESET_GPIO
+    (regression in 3.17~rc5-1~exp1)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 08 Jan 2016 12:08:13 +0000
 
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index cabe528..d00345a 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -438,6 +438,8 @@ CONFIG_PCI_MVEBU=y
 ##
 ## file: drivers/power/reset/Kconfig
 ##
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_QNAP=y
 CONFIG_POWER_RESET_RESTART=y
 

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