[linux] 02/03: [armhf] dsa: Enable NET_DSA_MV88E6123 as module, replacing NET_DSA_MV88E6123_61_65

[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 e0d8be480a23ab92815ca0e6aaa6ccf0208625b8
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue May 17 01:58:25 2016 +0100

    [armhf] dsa: Enable NET_DSA_MV88E6123 as module, replacing NET_DSA_MV88E6123_61_65
    
    The driver and kconfig symbol were renamed in 4.6.
---
 debian/changelog                 | 2 ++
 debian/config/armhf/config.armmp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0e75a4d..c126823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ linux (4.6-1~exp1) UNRELEASED; urgency=medium
   * Re-apply "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing",
     reverted upstream in 4.6
   * [arm64] Enable RANDOMIZE_BASE (kASLR)
+  * [armhf] dsa: Enable NET_DSA_MV88E6123 as module, replacing
+    NET_DSA_MV88E6123_61_65
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 16 May 2016 19:33:45 +0100
 
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index b277a2a..6eb8c36 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -600,7 +600,7 @@ CONFIG_CAN_SUN4I=m
 ##
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_NET_DSA_MV88E6123=m
 CONFIG_NET_DSA_MV88E6171=m
 CONFIG_NET_DSA_MV88E6352=m
 CONFIG_NET_DSA_BCM_SF2=m

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