[linux] 01/01: [armel, armhf] Use new Marvell CESA driver

[debian-kernel at lists.debian.org]

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

tbm pushed a commit to branch master
in repository linux.

commit 5e5fb4096bbe1f1f815fe9450f61d9cbc91dcc7a
Author: Martin Michlmayr <tbm at cyrius.com>
Date:   Fri Apr 22 12:39:51 2016 -0700

    [armel, armhf] Use new Marvell CESA driver
    
    Upstream is moving to the new Marvell CESA driver, so let's do the
    same in Debian.
---
 debian/changelog                   | 3 +++
 debian/config/armel/config.marvell | 2 +-
 debian/config/armhf/config.armmp   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 204032e..ad51592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ linux (4.6~rc3-1~exp2) UNRELEASED; urgency=medium
   * Update config for renaming/removal/replacement/merging/splitting of various
     symbols
 
+  [ Martin Michlmayr ]
+  * [armel, armhf] Use new Marvell CESA driver.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 20 Apr 2016 17:25:51 +0100
 
 linux (4.6~rc3-1~exp1) experimental; urgency=medium
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 19d3f46..049116a 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -201,7 +201,7 @@ CONFIG_ARM_KIRKWOOD_CPUIDLE=y
 ##
 ## file: drivers/crypto/Kconfig
 ##
-CONFIG_CRYPTO_DEV_MV_CESA=m
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 
 ##
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 9b7bd73..21361b1 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -189,7 +189,7 @@ CONFIG_ARM_TEGRA20_CPUFREQ=y
 ##
 ## file: drivers/crypto/Kconfig
 ##
-CONFIG_CRYPTO_DEV_MV_CESA=m
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m

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