diff options
-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 = { | |||
172 | .set_mctrl = integrator_uart_set_mctrl, | 172 | .set_mctrl = integrator_uart_set_mctrl, |
173 | }; | 173 | }; |
174 | 174 | ||
175 | #define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) | ||
176 | |||
177 | static DEFINE_RAW_SPINLOCK(cm_lock); | 175 | static DEFINE_RAW_SPINLOCK(cm_lock); |
178 | 176 | ||
179 | /** | 177 | /** |
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 @@ | |||
3 | */ | 3 | */ |
4 | void cm_control(u32, u32); | 4 | void cm_control(u32, u32); |
5 | 5 | ||
6 | #define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) | ||
7 | |||
6 | #define CM_CTRL_LED (1 << 0) | 8 | #define CM_CTRL_LED (1 << 0) |
7 | #define CM_CTRL_nMBDET (1 << 1) | 9 | #define CM_CTRL_nMBDET (1 << 1) |
8 | #define CM_CTRL_REMAP (1 << 2) | 10 | #define CM_CTRL_REMAP (1 << 2) |