summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/display.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-12-06 20:50:42 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-07 00:27:02 +0400
commitdeee6d5359969a0ce4e2760cfd7b9f379bd5698a (patch)
tree25ef0e899fd6f6ddc74396692aa9afa675f32243 /arch/arm/mach-omap2/display.c
parent16edc3df8a1b40fd381d3500f23527d7ad6e5e1b (diff)
downloadlinux-deee6d5359969a0ce4e2760cfd7b9f379bd5698a.tar.xz
ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes
ARM restart changes needed changes to common.h to make it local. This conflicted with v3.2-rc4 DSS related hwmod changes that git mergetool was not able to handle. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
-rw-r--r--arch/arm/mach-omap2/display.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index dce9905d64bb..bc6cf863a563 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -22,12 +22,13 @@
#include <linux/io.h>
#include <linux/clk.h>
#include <linux/err.h>
+#include <linux/delay.h>
#include <video/omapdss.h>
#include <plat/omap_hwmod.h>
#include <plat/omap_device.h>
#include <plat/omap-pm.h>
-#include <plat/common.h>
+#include "common.h"
#include "control.h"
#include "display.h"