summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-01-09 17:38:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-09 17:38:26 +0100
commit39c6c3480a9cb88e722af1142c7b31a00e9ec546 (patch)
tree3381f97f7485a14df8f2c47249d1aedfa509d205 /drivers/video
parentff6383c8e4bde31036fbd31f7961539be288d6af (diff)
parentbdcdcaad8199aba9774197e6f3296f659d30c399 (diff)
downloadbarebox-39c6c3480a9cb88e722af1142c7b31a00e9ec546.tar.gz
barebox-39c6c3480a9cb88e722af1142c7b31a00e9ec546.tar.xz
Merge branch 'for-next/mxs'
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/stm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/stm.c b/drivers/video/stm.c
index 175e4b611d..3c90c0dc3f 100644
--- a/drivers/video/stm.c
+++ b/drivers/video/stm.c
@@ -27,7 +27,6 @@
#include <stmp-device.h>
#include <linux/clk.h>
#include <linux/err.h>
-#include <mach/imx-regs.h>
#include <mach/fb.h>
#define HW_LCDIF_CTRL 0x00