summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap/lcdc.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-12-11 10:57:42 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-12-11 10:57:42 -0800
commit5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch)
tree6ba34db1109107023d753dd9fd5c359b3b990a04 /drivers/video/omap/lcdc.c
parent893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff)
parent3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff)
downloadkernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.gz
kernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz
kernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.zip
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'drivers/video/omap/lcdc.c')
-rw-r--r--drivers/video/omap/lcdc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 5f32cafbf74..b831e1df629 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -30,10 +30,11 @@
#include <linux/clk.h>
#include <plat/dma.h>
-#include <plat/omapfb.h>
#include <asm/mach-types.h>
+#include "omapfb.h"
+
#include "lcdc.h"
#define MODULE_NAME "lcdc"