[kernel] r11348 - in dists/trunk/linux-2.6/debian: . config/arm

[Martin Michlmayr]

Author: tbm
Date: Sun May 11 16:56:37 2008
New Revision: 11348

Log:
[arm/orion5x] Update the config to reflect upstream renaming this
subarch.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/config.orion5x

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun May 11 16:56:37 2008
@@ -19,6 +19,10 @@
   * 2.6.25 release cycle accidentaly disabled SIS190 reenable.
     (closes: #478773)
 
+  [ Martin Michlmayr ]
+  * [arm/orion5x] Update the config to reflect upstream renaming this
+    subarch.
+
  -- maximilian attems <maks at debian.org>  Sat, 26 Apr 2008 23:11:17 +0200
 
 linux-2.6 (2.6.25-1~experimental.1) UNRELEASED; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.orion5x	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.orion5x	Sun May 11 16:56:37 2008
@@ -53,7 +53,7 @@
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_MXC is not set
-CONFIG_ARCH_ORION=y
+CONFIG_ARCH_ORION5X=y
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
@@ -97,6 +97,11 @@
 CONFIG_MACH_LINKSTATION_PRO=y
 CONFIG_MACH_MV2120=y
 
+#
+## Power management
+#
+CONFIG_PLAT_ORION=y
+
 ##
 ## file: arch/arm/mm/Kconfig
 ##