diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:32:28 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:32:28 -0400 |
commit | d6bb0f27709b91e674ce1441e2dd5e68620edf14 (patch) | |
tree | 1b79f4894618a8849b06d0f12152e9c35053d94a /arch/arm/mach-imx/mach-kzm_arm11_01.c | |
parent | 2f540738f8d228016c6cd0d3b303896c174ecee3 (diff) | |
parent | 91056a63a7d8dbc817747a22d9a9490463323575 (diff) |
Merge branch 'imx/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-imx/mach-kzm_arm11_01.c')
-rw-r--r-- | arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c index 7c20e9e58006..4e030ac58847 100644 --- a/arch/arm/mach-imx/mach-kzm_arm11_01.c +++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | #include <mach/clock.h> | 37 | #include <mach/clock.h> |
38 | #include <mach/common.h> | 38 | #include <mach/common.h> |
39 | #include <mach/hardware.h> | ||
39 | #include <mach/iomux-mx3.h> | 40 | #include <mach/iomux-mx3.h> |
40 | 41 | ||
41 | #include "devices-imx31.h" | 42 | #include "devices-imx31.h" |