From 4ec5e3c4fe0cc6d7344f4e836c903061e74f4f8c Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Wed, 10 Dec 2014 19:16:10 +0000
Subject: [PATCH] [armel/kirkwood] Enable ARCH_MULTI_V5, MACH_NETXBIG

svn path=/dists/trunk/linux/; revision=22185
---
 debian/changelog                    | 4 ++--
 debian/config/armel/config.kirkwood | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a698e1281..b0d59d100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,8 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
   * wireless: Enable RTL8192EE, RTL8821AE as modules for all architectures
     (replacing R8192EE, R8821AE for x86 only)
   * media: Enable VIDEO_VIVID as module (replacing VIDEO_VIVI)
-  * [armel/kirkwood] Enable ARCH_MVEBU and MACH_KIRKWOOD, replacing
-    ARCH_KIRKWOOD etc.
+  * [armel/kirkwood] Enable ARCH_MULTI_V5, ARCH_MVEBU, MACH_KIRKWOOD and
+    MACH_NETXBIG, replacing ARCH_KIRKWOOD etc.
   * [powerpc/powerpc64,ppc64*] Enable SCSI_IBMVFC as module, replacing
     SCSI_IBMVSCSIS
   * input/tablet: Enable TABLET_SERIAL_WACOM4 as module
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 714413474..baf4d59ae 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -1,6 +1,8 @@
 ##
 ## file: arch/arm/Kconfig
 ##
+CONFIG_ARCH_MULTI_V5=y
+# CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_PCI=y
 CONFIG_HIGHMEM=y
 CONFIG_UACCESS_WITH_MEMCPY=y
@@ -27,6 +29,7 @@ CONFIG_FPE_NWFPE=y
 ##
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 
 ##
 ## file: arch/arm/mm/Kconfig