diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-12 16:10:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-12 16:10:45 -0800 |
| commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
| tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /arch/arm/mach-imx/devices-imx27.h | |
| parent | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (diff) | |
| parent | 48d224d1efec98b0b78e511150b4f5752beceb7c (diff) | |
| download | blackbird-op-linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.tar.gz blackbird-op-linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.zip | |
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/devices-imx27.h')
| -rw-r--r-- | arch/arm/mach-imx/devices-imx27.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/devices-imx27.h b/arch/arm/mach-imx/devices-imx27.h index 04822932cdd1..8a1ad7972d4c 100644 --- a/arch/arm/mach-imx/devices-imx27.h +++ b/arch/arm/mach-imx/devices-imx27.h @@ -6,8 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include <mach/mx27.h> -#include <mach/devices-common.h> +#include "devices/devices-common.h" extern const struct imx_fec_data imx27_fec_data; #define imx27_add_fec(pdata) \ |
