[linux] 01/01: [armel/marvell] Change MTD_CFI_AMDSTD 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 cea35dbc2dcd7b0bda98da3ad663b4b62812e05d
Author: Roger Shimizu <rogershimizu at gmail.com>
Date:   Thu Mar 24 08:21:40 2016 +0900

    [armel/marvell] Change MTD_CFI_AMDSTD from module to built-in
    
    Because orion5x-based Buffalo Linkstation devices still need it
    (Closes: #818598)
---
 debian/changelog                   | 5 +++++
 debian/config/armel/config.marvell | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a92ba45..6bbfe0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ linux (4.4.6-2) UNRELEASED; urgency=medium
   [ Salvatore Bonaccorso ]
   * [x86] iopl/64: properly context-switch IOPL on Xen PV (CVE-2016-3157)
 
+  [ Roger Shimizu ]
+  * [armel/marvell] Change MTD_CFI_AMDSTD from module to built-in
+    because orion5x-based Buffalo Linkstation devices still need it
+    (Closes: #818598)
+
  -- Salvatore Bonaccorso <carnil at debian.org>  Thu, 17 Mar 2016 18:19:26 +0100
 
 linux (4.4.6-1) unstable; urgency=medium
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 22392dd..ef7803c 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -373,8 +373,8 @@ CONFIG_MTD_CFI_I4=y
 # CONFIG_MTD_OTP is not set
 #. Needed e.g. on QNAP devices
 CONFIG_MTD_CFI_INTELEXT=y
-#. Needed e.g. on the D-Link DNS-323
-CONFIG_MTD_CFI_AMDSTD=m
+#. Needed e.g. on D-Link DNS-323, Buffalo KuroBox-Pro, Buffalo Linkstation LS-GL / LS-WTGL, etc
+CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set

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