Merge commit 'v3.3-rc1' into fbdev-next
[~shefty/rdma-dev.git] / arch / arm / mach-omap2 / display.c
index d6e65e29d83dd2972f726404cb6af53e3ae8b80a..3677b1f58b85f32c25e9c4f1e886a0e259ee9102 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 "mux.h"
 #include "control.h"