ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes
authorTony Lindgren <tony@atomide.com>
Tue, 6 Dec 2011 16:50:42 +0000 (17:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 6 Dec 2011 20:27:02 +0000 (20:27 +0000)
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>
arch/arm/mach-omap2/display.c

index dce9905d64bb6e1af6c0b80d012142ffdfca49ee..bc6cf863a563bcf51f76240598ca6424b92939fe 100644 (file)
 #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"