---

yaml --- r: 326978 b: refs/heads/master c: b7ea032 h: refs/heads/master v: v3
git-mirror · Aug 1, 2012 · e629130 · e629130
1 parent a55eb69
commit e629130
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     /**
@@ Expand Down @@