diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 09:49:47 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 09:49:47 (GMT) |
commit | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch) | |
tree | 3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-omap2/board-generic.c | |
parent | e879c862fb81b986095ae7a4676b2281c2f97957 (diff) | |
parent | 3f1517a761905c55d1db71cb0afd359d74a76a6c (diff) | |
download | linux-fsl-qoriq-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.tar.xz |
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index fb55fa3d..a89d723 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -20,8 +20,7 @@ #include <asm/mach/arch.h> #include <plat/board.h> -#include <plat/common.h> -#include <mach/omap4-common.h> +#include "common.h" #include "common-board-devices.h" /* |