diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-15 22:02:11 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-15 22:02:11 -0800 |
| commit | 017c899c2db3da481cc174049e47307ed3aba530 (patch) | |
| tree | d2e55932579421d0196ac63c45bad1de8dbfa5eb /arch/arm/mach-omap2/display.c | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | c97136307c2cd336a3ee68cc0890b0f55d01d2d4 (diff) | |
Merge branch 'omap/soc' into next/soc
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index dce9905d64b..bc6cf863a56 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" |