diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
| commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
| tree | 544713c8b4359221df3677fb93a52892c57fbcee /arch/arm/mach-omap2/display.c | |
| parent | 0aac881246fb25d017617cd7be68e93326d51ce1 (diff) | |
| parent | acea7c7b81e8f67513aebade8cb99c7789c44d8c (diff) | |
| download | olio-linux-3.10-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.tar.xz olio-linux-3.10-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.zip | |
Merge branch 'iomap' into cleanup
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 3677b1f58b8..28d16a4bb61 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -30,6 +30,7 @@ #include <plat/omap-pm.h> #include "common.h" +#include "iomap.h" #include "mux.h" #include "control.h" #include "display.h" |