summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/drm/drm.c
diff options
context:
space:
mode:
authorArto Merilainen <amerilainen@nvidia.com>2013-03-22 15:34:06 +0100
committerThierry Reding <thierry.reding@avionic-design.de>2013-04-22 12:39:13 +0200
commitc89c0ea63fcd045bdc17076fd078676e1da0c41a (patch)
tree58810e133f1b7339401b0fcf4627a1d746b83272 /drivers/gpu/host1x/drm/drm.c
parentdrm/tegra: Move drm to live under host1x (diff)
downloadlinux-c89c0ea63fcd045bdc17076fd078676e1da0c41a.tar.xz
linux-c89c0ea63fcd045bdc17076fd078676e1da0c41a.zip
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 <amerilainen@nvidia.com> Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat (limited to 'drivers/gpu/host1x/drm/drm.c')
-rw-r--r--drivers/gpu/host1x/drm/drm.c4
1 files changed, 2 insertions, 2 deletions
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);
}