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-4430sdp.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-4430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 515646886b59..cff2e3249fee 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -27,13 +27,12 @@ #include <linux/leds_pwm.h> #include <mach/hardware.h> -#include <mach/omap4-common.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <plat/board.h> -#include <plat/common.h> +#include "common.h" #include <plat/usb.h> #include <plat/mmc.h> #include <plat/omap4-keypad.h> |