diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
| commit | b46ad442a998beb8453fd6b9c5a67cd8a1cd1889 (patch) | |
| tree | a5da6ea4aa5c6575fbeaddd3e24fbf9d20087019 /arch/arm/mach-omap2/display.c | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | a890b6760d975cdbdfcdf5753dab4c91059af9b1 (diff) | |
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/board
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 dce9905d64bb..bc6cf863a563 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c | |||
| @@ -22,12 +22,13 @@ | |||
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 24 | #include <linux/err.h> | 24 | #include <linux/err.h> |
| 25 | #include <linux/delay.h> | ||
| 25 | 26 | ||
| 26 | #include <video/omapdss.h> | 27 | #include <video/omapdss.h> |
| 27 | #include <plat/omap_hwmod.h> | 28 | #include <plat/omap_hwmod.h> |
| 28 | #include <plat/omap_device.h> | 29 | #include <plat/omap_device.h> |
| 29 | #include <plat/omap-pm.h> | 30 | #include <plat/omap-pm.h> |
| 30 | #include <plat/common.h> | 31 | #include "common.h" |
| 31 | 32 | ||
| 32 | #include "control.h" | 33 | #include "control.h" |
| 33 | #include "display.h" | 34 | #include "display.h" |