diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-20 00:12:47 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-20 00:12:53 -0500 |
| commit | 4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch) | |
| tree | 0ac643f1a0c57a88452ef017c61d325fab98d00a /arch/arm/mach-omap2/display.c | |
| parent | f68453e076dcf140c4a7bdd385f239b1e41be983 (diff) | |
| parent | 1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff) | |
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit)
ARM: picoxcell: implement watchdog restart
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" |