From 14306acec3c6b1a835d5ab1833060cb901f0afe2 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Fri, 28 Nov 2008 13:49:22 +0800 Subject: [PATCH] --- yaml --- r: 123660 b: refs/heads/master c: b31eca4f006c3efdd2dc501270172aa7ff8614b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/pxa-regs.h | 7 ------- trunk/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 7 +++++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a6f0941972c6..a28ee6a79b94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a07efb5dac2a1c9125b9bd84d2f9ea4803d93e60 +refs/heads/master: b31eca4f006c3efdd2dc501270172aa7ff8614b9 diff --git a/trunk/arch/arm/mach-pxa/include/mach/pxa-regs.h b/trunk/arch/arm/mach-pxa/include/mach/pxa-regs.h index 859b35e1a7ee..ab62f6c11e0e 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/pxa-regs.h +++ b/trunk/arch/arm/mach-pxa/include/mach/pxa-regs.h @@ -553,11 +553,4 @@ * Core Clock - see arch/arm/mach-pxa/include/mach/pxa2xx-regs.h */ -/* PWRMODE register M field values */ - -#define PWRMODE_IDLE 0x1 -#define PWRMODE_STANDBY 0x2 -#define PWRMODE_SLEEP 0x3 -#define PWRMODE_DEEPSLEEP 0x7 - #endif diff --git a/trunk/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h b/trunk/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h index 806ecfea44bf..2b71d87c898f 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h +++ b/trunk/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h @@ -243,4 +243,11 @@ #define OSCC_OON (1 << 1) /* 32.768kHz OON (write-once only bit) */ #define OSCC_OOK (1 << 0) /* 32.768kHz OOK (read-only bit) */ +/* PWRMODE register M field values */ + +#define PWRMODE_IDLE 0x1 +#define PWRMODE_STANDBY 0x2 +#define PWRMODE_SLEEP 0x3 +#define PWRMODE_DEEPSLEEP 0x7 + #endif