diff options
| author | Bryan Wu <bryan.wu@canonical.com> | 2012-03-14 01:46:50 +0800 |
|---|---|---|
| committer | Bryan Wu <bryan.wu@canonical.com> | 2012-08-01 11:22:07 +0800 |
| commit | b7ea032e8ab5ac1eb667ae7566ceffc33f910259 (patch) | |
| tree | 7f7fa9204d28d1eb8228c2ea42165b4128ba37c1 /arch | |
| parent | 77a4949436452e3ec1b03badb93e5b2dd40b59a2 (diff) | |
| download | linux-b7ea032e8ab5ac1eb667ae7566ceffc33f910259.tar.gz linux-b7ea032e8ab5ac1eb667ae7566ceffc33f910259.tar.bz2 linux-b7ea032e8ab5ac1eb667ae7566ceffc33f910259.zip | |
ARM: mach-integrator: move CM_CTRL to header file for accessing by other functions
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/cm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index eaf6c6366ffa..8c5356255a59 100644 --- a/arch/arm/mach-integrator/core.c +++ b/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/arch/arm/mach-integrator/include/mach/cm.h b/arch/arm/mach-integrator/include/mach/cm.h index 445d57adb043..1a78692e32a4 100644 --- a/arch/arm/mach-integrator/include/mach/cm.h +++ b/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) |