[kernel] r22185 - in dists/trunk/linux/debian: . config/armel

[Ben Hutchings]

Author: benh
Date: Wed Dec 10 19:16:10 2014
New Revision: 22185

Log:
[armel/kirkwood] Enable ARCH_MULTI_V5, MACH_NETXBIG

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/armel/config.kirkwood

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Wed Dec 10 16:50:18 2014	(r22184)
+++ dists/trunk/linux/debian/changelog	Wed Dec 10 19:16:10 2014	(r22185)
@@ -22,8 +22,8 @@
   * 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

Modified: dists/trunk/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.kirkwood	Wed Dec 10 16:50:18 2014	(r22184)
+++ dists/trunk/linux/debian/config/armel/config.kirkwood	Wed Dec 10 19:16:10 2014	(r22185)
@@ -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_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 
 ##
 ## file: arch/arm/mm/Kconfig