From 62749343703b9c6a8c02d3dff072d3049df00469 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 16 Jun 2011 17:06:09 +0100 Subject: [PATCH] --- yaml --- r: 259567 b: refs/heads/master c: 7b847f6ded0ae3ee51d92089282d5c8f67b65b9e h: refs/heads/master i: 259565: c150fdd229e3169601e565f3c388eadb97475c69 259563: 83f92cd81cd1782d04b5e585ba2a9d3c852448d1 259559: 1762fc2de4b1ede2d751c3eb6efd69493d30c718 259551: 579dfa936b10f2d97ba31f2f4689420c8bbdc2ea v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/psb_gtt.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e9b301265b35..33d96fd11c06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dca22184262de0171bafdf613a8d3992a818b70f +refs/heads/master: 7b847f6ded0ae3ee51d92089282d5c8f67b65b9e diff --git a/trunk/drivers/staging/gma500/psb_gtt.c b/trunk/drivers/staging/gma500/psb_gtt.c index 74c5a6569d08..1d0e242fb390 100644 --- a/trunk/drivers/staging/gma500/psb_gtt.c +++ b/trunk/drivers/staging/gma500/psb_gtt.c @@ -78,7 +78,6 @@ u32 *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r) */ static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r) { - struct drm_psb_private *dev_priv = dev->dev_private; u32 *gtt_slot, pte; int numpages = (r->resource.end + 1 - r->resource.start) >> PAGE_SHIFT; struct page **pages; @@ -490,7 +489,7 @@ int psb_gtt_init(struct drm_device *dev, int resume) goto out_err; } - DRM_DEBUG("%s: vram kernel virtual address %p\n", dev_priv->vram_addr); + DRM_DEBUG("gma500: vram kernel virtual address %p\n", dev_priv->vram_addr); tt_pages = (pg->gatt_pages < PSB_TT_PRIV0_PLIMIT) ? (pg->gatt_pages) : PSB_TT_PRIV0_PLIMIT;