summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dss.h
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2014-04-11 16:25:06 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-04-14 16:42:49 +0300
commit5c348ba96cdfd2db6a254de259b54cc20fa7d78a (patch)
tree8da9b39de63d72c50658f2b720bf5058c314f686 /drivers/video/omap2/dss/dss.h
parenta57a22c817fbcb69d41ae517e02933618482f42d (diff)
downloadop-kernel-dev-5c348ba96cdfd2db6a254de259b54cc20fa7d78a.zip
op-kernel-dev-5c348ba96cdfd2db6a254de259b54cc20fa7d78a.tar.gz
OMAPDSS: Change struct reg_field to dispc_reg_field
Avoid colision with regmap's struct reg_field definition by renaming omapdss's struct reg_field to dispc_reg_field, and moving it inside dispc.c as that's the only place it is used. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dss.h')
-rw-r--r--drivers/video/omap2/dss/dss.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 918fec1..560078f 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -131,12 +131,6 @@ struct dsi_clock_info {
u16 lp_clk_div;
};
-struct reg_field {
- u16 reg;
- u8 high;
- u8 low;
-};
-
struct dss_lcd_mgr_config {
enum dss_io_pad_mode io_pad_mode;
OpenPOWER on IntegriCloud