From c89c0ea63fcd045bdc17076fd078676e1da0c41a Mon Sep 17 00:00:00 2001 From: Arto Merilainen Date: Fri, 22 Mar 2013 16:34:06 +0200 Subject: gpu: host1x: drm: Rename host1x to host1x_drm Both host1x and drm drivers have host1x structures. This patch renames the host1x structure under drm to follow name host1x_drm. Signed-off-by: Arto Merilainen Signed-off-by: Terje Bergstrom Reviewed-by: Thierry Reding Tested-by: Thierry Reding Tested-by: Erik Faye-Lund Signed-off-by: Thierry Reding --- drivers/gpu/host1x/drm/drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/host1x/drm/drm.c') diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c index 9d452df5bcad..6c59bcdb65e6 100644 --- a/drivers/gpu/host1x/drm/drm.c +++ b/drivers/gpu/host1x/drm/drm.c @@ -26,7 +26,7 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) { struct device *dev = drm->dev; - struct host1x *host1x; + struct host1x_drm *host1x; int err; host1x = dev_get_drvdata(dev); @@ -69,7 +69,7 @@ static int tegra_drm_open(struct drm_device *drm, struct drm_file *filp) static void tegra_drm_lastclose(struct drm_device *drm) { - struct host1x *host1x = drm->dev_private; + struct host1x_drm *host1x = drm->dev_private; drm_fbdev_cma_restore_mode(host1x->fbdev); } -- cgit v1.2.3