From e4f073e28859f0ea203915f420e6ade2679c18c2 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Thu, 13 Sep 2012 21:18:39 +0800 Subject: [PATCH] --- yaml --- r: 339738 b: refs/heads/master c: 17c342ae23751424d3c943d02a4dbc8607e629d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/cpu-imx25.c | 3 ++- trunk/arch/arm/mach-imx/cpu-imx31.c | 2 +- trunk/arch/arm/mach-imx/cpu-imx35.c | 3 ++- trunk/arch/arm/mach-imx/{include/mach => }/iim.h | 0 5 files changed, 6 insertions(+), 4 deletions(-) rename trunk/arch/arm/mach-imx/{include/mach => }/iim.h (100%) diff --git a/[refs] b/[refs] index 6a44d3c9b749..422e71518bf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e29248c9a7522cb50edd29f2a717be8f323cbeb3 +refs/heads/master: 17c342ae23751424d3c943d02a4dbc8607e629d4 diff --git a/trunk/arch/arm/mach-imx/cpu-imx25.c b/trunk/arch/arm/mach-imx/cpu-imx25.c index 6914bcbf84e4..79d4d1c56898 100644 --- a/trunk/arch/arm/mach-imx/cpu-imx25.c +++ b/trunk/arch/arm/mach-imx/cpu-imx25.c @@ -12,7 +12,8 @@ #include #include #include -#include + +#include "iim.h" static int mx25_cpu_rev = -1; diff --git a/trunk/arch/arm/mach-imx/cpu-imx31.c b/trunk/arch/arm/mach-imx/cpu-imx31.c index 9d3a91c96a53..51c938fefe6d 100644 --- a/trunk/arch/arm/mach-imx/cpu-imx31.c +++ b/trunk/arch/arm/mach-imx/cpu-imx31.c @@ -12,9 +12,9 @@ #include #include #include -#include #include "common.h" +#include "iim.h" static int mx31_cpu_rev = -1; diff --git a/trunk/arch/arm/mach-imx/cpu-imx35.c b/trunk/arch/arm/mach-imx/cpu-imx35.c index 846e46eb8cbf..8b36d3ac79e2 100644 --- a/trunk/arch/arm/mach-imx/cpu-imx35.c +++ b/trunk/arch/arm/mach-imx/cpu-imx35.c @@ -11,7 +11,8 @@ #include #include #include -#include + +#include "iim.h" static int mx35_cpu_rev = -1; diff --git a/trunk/arch/arm/mach-imx/include/mach/iim.h b/trunk/arch/arm/mach-imx/iim.h similarity index 100% rename from trunk/arch/arm/mach-imx/include/mach/iim.h rename to trunk/arch/arm/mach-imx/iim.h