diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 10:49:47 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 10:49:47 +0100 |
commit | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch) | |
tree | 3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-omap2/board-devkit8000.c | |
parent | ARM: restart: only perform setup for restart when soft-restarting (diff) | |
parent | ARM: restart: remove poodle restart handler (diff) | |
download | linux-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.tar.xz linux-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.zip |
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
-rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 90154e411da0..99e6e7a76d2e 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -41,7 +41,7 @@ #include <asm/mach/flash.h> #include <plat/board.h> -#include <plat/common.h> +#include "common.h" #include <plat/gpmc.h> #include <plat/nand.h> #include <plat/usb.h> |