From e6291303e25c45d95dedba4eabfe39be13fdafa9 Mon Sep 17 00:00:00 2001 From: Bryan Wu Date: Wed, 14 Mar 2012 01:46:50 +0800 Subject: [PATCH] --- yaml --- r: 326978 b: refs/heads/master c: b7ea032e8ab5ac1eb667ae7566ceffc33f910259 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/core.c | 2 -- trunk/arch/arm/mach-integrator/include/mach/cm.h | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f34682998b81..b75c3fdbbe14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77a4949436452e3ec1b03badb93e5b2dd40b59a2 +refs/heads/master: b7ea032e8ab5ac1eb667ae7566ceffc33f910259 diff --git a/trunk/arch/arm/mach-integrator/core.c b/trunk/arch/arm/mach-integrator/core.c index eaf6c6366ffa..8c5356255a59 100644 --- a/trunk/arch/arm/mach-integrator/core.c +++ b/trunk/arch/arm/mach-integrator/core.c @@ -172,8 +172,6 @@ static struct amba_pl010_data integrator_uart_data = { .set_mctrl = integrator_uart_set_mctrl, }; -#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) - static DEFINE_RAW_SPINLOCK(cm_lock); /** diff --git a/trunk/arch/arm/mach-integrator/include/mach/cm.h b/trunk/arch/arm/mach-integrator/include/mach/cm.h index 445d57adb043..1a78692e32a4 100644 --- a/trunk/arch/arm/mach-integrator/include/mach/cm.h +++ b/trunk/arch/arm/mach-integrator/include/mach/cm.h @@ -3,6 +3,8 @@ */ void cm_control(u32, u32); +#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) + #define CM_CTRL_LED (1 << 0) #define CM_CTRL_nMBDET (1 << 1) #define CM_CTRL_REMAP (1 << 2)