diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:11:46 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:11:46 +0100 |
| commit | bac2f668864eca45b702ee394bef4c5f3a86658c (patch) | |
| tree | 9b82100e2f447ae2b3b20f4a935b8020c885adcf /arch/arm/mach-imx/mach-pca100.c | |
| parent | Merge branch 'omap/cleanup-prcm-part2' into next/dt (diff) | |
| parent | Add device tree file for the armadeus apf27 (diff) | |
| download | linux-bac2f668864eca45b702ee394bef4c5f3a86658c.tar.xz linux-bac2f668864eca45b702ee394bef4c5f3a86658c.zip | |
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for 3.8
* tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6:
Add device tree file for the armadeus apf27
ARM i.MX: Add Ka-Ro TX25 devicetree
ARM i.MX25: Add devicetree
ARM i.MX25: Add devicetree support
ARM i.MX25: Add missing clock gates
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index de8516b7d69f..eee369fa94a2 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c @@ -32,13 +32,13 @@ #include <asm/mach/arch.h> #include <asm/mach-types.h> -#include <mach/common.h> -#include <mach/hardware.h> -#include <mach/iomux-mx27.h> #include <asm/mach/time.h> -#include <mach/ulpi.h> +#include "common.h" #include "devices-imx27.h" +#include "hardware.h" +#include "iomux-mx27.h" +#include "ulpi.h" #define OTG_PHY_CS_GPIO (GPIO_PORTB + 23) #define USBH2_PHY_CS_GPIO (GPIO_PORTB + 24) |