From 32c2ad1c784726fd0ea0be8e13cbbcfeaa0fdec4 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Sun, 11 May 2008 16:56:37 +0000 Subject: [PATCH] [arm/orion5x] Update the config to reflect upstream renaming this subarch. svn path=/dists/trunk/linux-2.6/; revision=11348 --- debian/changelog | 4 ++++ debian/config/arm/config.orion5x | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a1d2d63ec..4f8304ac0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,10 @@ linux-2.6 (2.6.26~rc1-1~experimental.1) UNRELEASED; urgency=low * 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 Sat, 26 Apr 2008 23:11:17 +0200 linux-2.6 (2.6.25-1~experimental.1) UNRELEASED; urgency=low diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x index 3f297b330..f7307031c 100644 --- a/debian/config/arm/config.orion5x +++ b/debian/config/arm/config.orion5x @@ -53,7 +53,7 @@ CONFIG_VECTORS_BASE=0xffff0000 # 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_TS409=y CONFIG_MACH_LINKSTATION_PRO=y CONFIG_MACH_MV2120=y +# +## Power management +# +CONFIG_PLAT_ORION=y + ## ## file: arch/arm/mm/Kconfig ##