diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 15:01:00 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 04:03:10 +0200 |
| commit | e3372474cfa0dc016f10ec47baddbd1ed0abecf3 (patch) | |
| tree | ff239d4f665a9c30158f554600c463433e474a05 /arch/arm/mach-imx/mach-mx31ads.c | |
| parent | ARM: imx: merge plat-mxc into mach-imx (diff) | |
| download | linux-e3372474cfa0dc016f10ec47baddbd1ed0abecf3.tar.xz linux-e3372474cfa0dc016f10ec47baddbd1ed0abecf3.zip | |
ARM: imx: include common.h rather than mach/common.h
Rename mach-imx/include/mach/common.h to mach-imx/common.h and update
all users to include common.h rather than mach/common.h.
It also removes an unneeded inclusion to common.h in
mach-imx/devices/devices.c.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31ads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31ads.c b/arch/arm/mach-imx/mach-mx31ads.c index 837839bb1597..deb89d2cc1bb 100644 --- a/arch/arm/mach-imx/mach-mx31ads.c +++ b/arch/arm/mach-imx/mach-mx31ads.c @@ -28,7 +28,6 @@ #include <asm/mach/time.h> #include <asm/memory.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/hardware.h> #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1 @@ -37,6 +36,7 @@ #include <linux/mfd/wm8350/pmic.h> #endif +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" |