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

diff --cc arch/arm/mach-shmobile/clock-sh7372.c
index dc8c899aa5eb4aa0b70982bc64bae54498d30522,c239ab10c95b25bd5ee67041b502ac6a608c5417..5309544957b7e775b0ad3b927aa4022363172264
--- 1/arch/arm/mach-shmobile/clock-sh7372.c
--- 2/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) \

diff --cc arch/arm/mach-shmobile/include/mach/sh7372.h
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge