OMAPDSS: Change struct reg_field to dispc_reg_field
authorJyri Sarha <jsarha@ti.com>
Fri, 11 Apr 2014 13:25:06 +0000 (16:25 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 14 Apr 2014 13:42:49 +0000 (16:42 +0300)
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>
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/dss.h

Simple merge
Simple merge