diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:45 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:45 -0500 |
commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /arch/arm/mach-imx/mach-pcm037.c | |
parent | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (diff) | |
parent | 48d224d1efec98b0b78e511150b4f5752beceb7c (diff) |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm037.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pcm037.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c index e3c45130fb3c..547fef133f65 100644 --- a/arch/arm/mach-imx/mach-pcm037.c +++ b/arch/arm/mach-imx/mach-pcm037.c | |||
@@ -42,13 +42,13 @@ | |||
42 | #include <asm/mach/time.h> | 42 | #include <asm/mach/time.h> |
43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
44 | #include <asm/memblock.h> | 44 | #include <asm/memblock.h> |
45 | #include <mach/common.h> | ||
46 | #include <mach/hardware.h> | ||
47 | #include <mach/iomux-mx3.h> | ||
48 | #include <mach/ulpi.h> | ||
49 | 45 | ||
46 | #include "common.h" | ||
50 | #include "devices-imx31.h" | 47 | #include "devices-imx31.h" |
48 | #include "hardware.h" | ||
49 | #include "iomux-mx3.h" | ||
51 | #include "pcm037.h" | 50 | #include "pcm037.h" |
51 | #include "ulpi.h" | ||
52 | 52 | ||
53 | static enum pcm037_board_variant pcm037_instance = PCM037_PCM970; | 53 | static enum pcm037_board_variant pcm037_instance = PCM037_PCM970; |
54 | 54 | ||