summaryrefslogtreecommitdiff
path: root/drivers/video/omap/lcd_osk.c
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-04-08 21:39:22 +0200
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-04-08 21:39:22 +0200
commit7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f (patch)
tree78a2cf601e986694765b28079bf749a8eaa6a2b9 /drivers/video/omap/lcd_osk.c
parent0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6 (diff)
parent918d7f6f68620e0721bb31402ebf87e15f826831 (diff)
downloadolio-linux-3.10-7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f.tar.xz
olio-linux-3.10-7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f.zip
Merge remote-tracking branch 'clk/clk-for-3.10' into sunxi/core-for-3.10
Diffstat (limited to 'drivers/video/omap/lcd_osk.c')
-rw-r--r--drivers/video/omap/lcd_osk.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index 3aa62da8919..7fbe04bce0e 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -24,7 +24,10 @@
#include <linux/platform_device.h>
#include <asm/gpio.h>
+
+#include <mach/hardware.h>
#include <mach/mux.h>
+
#include "omapfb.h"
static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)