summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-04-24 13:28:18 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-05-09 12:55:18 +0300
commit24f13a6679c9b75687f3ae48994e42071d4e9fce (patch)
tree95d18b3e6ce05a3250c2cfb42eaca216a4e4febf /include/video
parentc84d95058a41445f8d8e6c23965f97a8445df978 (diff)
video: omap2dss: fix LPAE warnings
If LPAE is enabled, dma_addr_t is 64 bit, so we have to change a few type for everything in this driver to match again. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: linux-fbdev@vger.kernel.org Cc: linux-omap@vger.kernel.org Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'include/video')
-rw-r--r--include/video/omapdss.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 6adb4453460..ded61a9e521 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -388,8 +388,8 @@ struct omap_dss_cpr_coefs {
};
struct omap_overlay_info {
- u32 paddr;
- u32 p_uv_addr; /* for NV12 format */
+ dma_addr_t paddr;
+ dma_addr_t p_uv_addr; /* for NV12 format */
u16 screen_width;
u16 width;
u16 height;