From 9a61e8542d5357cbd9fcd1a951f2a4a7ade133c1 Mon Sep 17 00:00:00 2001 From: "Justin P. Mattock" Date: Wed, 30 Mar 2011 10:01:42 +0100 Subject: [PATCH] --- yaml --- r: 249035 b: refs/heads/master c: 8fc5945f8fdcd7e902b3852051c8e1d9f0714487 h: refs/heads/master i: 249033: 22f0f95a703425f60a284f3c504c6806d77054e6 249031: cbdeb42ee41c34d104545d0af92ca4a28c5ea663 v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/psb_fb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c86b5a67f5d3..3901a92bb6c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aea74b6567997bbb670357caa57aff39c8c390a5 +refs/heads/master: 8fc5945f8fdcd7e902b3852051c8e1d9f0714487 diff --git a/trunk/drivers/staging/gma500/psb_fb.c b/trunk/drivers/staging/gma500/psb_fb.c index c15e2f9a244d..dc6f74a071ab 100644 --- a/trunk/drivers/staging/gma500/psb_fb.c +++ b/trunk/drivers/staging/gma500/psb_fb.c @@ -192,7 +192,7 @@ static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) struct drm_device *dev = psbfb->base.dev; struct drm_psb_private *dev_priv = dev->dev_private; struct psb_gtt *pg = dev_priv->pg; - unsigned long phys_addr = (unsigned long)pg->stolen_base;; + unsigned long phys_addr = (unsigned long)pg->stolen_base; page_num = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;