diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:06:24 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:06:24 -0500 |
| commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
| tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /drivers/video/omap/lcdc.c | |
| parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'drivers/video/omap/lcdc.c')
| -rw-r--r-- | drivers/video/omap/lcdc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 7767338f8b14..c39d6e46f8c5 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/gfp.h> | 31 | #include <linux/gfp.h> |
| 32 | 32 | ||
| 33 | #include <mach/lcdc.h> | 33 | #include <mach/lcdc.h> |
| 34 | #include <plat/dma.h> | 34 | #include <plat-omap/dma-omap.h> |
| 35 | 35 | ||
| 36 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
| 37 | 37 | ||