From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 29 Aug 2011 07:10:24 +0000 (+0900)
Subject: Merge branch 'rmobile/dma' into rmobile-fixes-for-linus
X-Git-Tag: v3.1-rc5~14^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a1c049aa9d31710dac5a794b47be5a081a886e4;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'rmobile/dma' into rmobile-fixes-for-linus
---

8a1c049aa9d31710dac5a794b47be5a081a886e4
diff --cc arch/arm/mach-shmobile/clock-sh7372.c
index dc8c899,c239ab1..5309544
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@@ -509,10 -509,10 +509,10 @@@ enum { MSTP001
         MSTP118, MSTP117, MSTP116, MSTP113,
         MSTP106, MSTP101, MSTP100,
         MSTP223,
-        MSTP218, MSTP217, MSTP216,
+        MSTP214, MSTP218, MSTP217, MSTP216,
         MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
 -       MSTP329, MSTP328, MSTP323, MSTP322, MSTP314, MSTP313, MSTP312,
 -       MSTP423, MSTP415, MSTP413, MSTP411, MSTP410, MSTP406, MSTP403,
 +       MSTP328, MSTP323, MSTP322, MSTP314, MSTP313, MSTP312,
 +       MSTP423, MSTP415, MSTP413, MSTP411, MSTP410, MSTP406, MSTP403, MSTP400,
         MSTP_NR };
  
  #define MSTP(_parent, _reg, _bit, _flags) \