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

[Ben Hutchings]

Author: benh
Date: Tue Dec  9 21:43:08 2014
New Revision: 22173

Log:
[armel/kirkwood] Enable ARCH_MVEBU and MACH_KIRKWOOD, replacing ARCH_KIRKWOOD etc.

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	Tue Dec  9 21:37:16 2014	(r22172)
+++ dists/trunk/linux/debian/changelog	Tue Dec  9 21:43:08 2014	(r22173)
@@ -21,6 +21,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.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 

Modified: dists/trunk/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.kirkwood	Tue Dec  9 21:37:16 2014	(r22172)
+++ dists/trunk/linux/debian/config/armel/config.kirkwood	Tue Dec  9 21:43:08 2014	(r22173)
@@ -23,6 +23,12 @@
 # CONFIG_ARCH_MXC is not set
 
 ##
+## file: arch/arm/mach-mvebu/Kconfig
+##
+CONFIG_ARCH_MVEBU=y
+CONFIG_MACH_KIRKWOOD=y
+
+##
 ## file: arch/arm/mm/Kconfig
 ##
 CONFIG_ARM_THUMB=y
@@ -656,22 +662,3 @@
 ##
 CONFIG_SND_KIRKWOOD_SOC=m
 
-##
-## file: unknown
-##
-CONFIG_ARCH_KIRKWOOD=y
-CONFIG_ARCH_KIRKWOOD_DT=y
-CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_NET2BIG_V2=y
-CONFIG_MACH_NET5BIG_V2=y
-CONFIG_MACH_OPENRD_BASE=y
-CONFIG_MACH_OPENRD_CLIENT=y
-CONFIG_MACH_OPENRD_ULTIMATE=y
-CONFIG_MACH_RD88F6192_NAS=y
-CONFIG_MACH_RD88F6281=y
-CONFIG_MACH_T5325=y
-CONFIG_MACH_TS219=y
-CONFIG_MACH_TS41X=y
-CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
-CONFIG_SND_KIRKWOOD_SOC_T5325=m
-