diff --git a/[refs] b/[refs] index 875e8f61d2a7..1184997302cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2d57b337f88229e31f2ee11ab64e3caf5db8031 +refs/heads/master: 3afad3c2bc554d2623cc75b557a445d5e7239845 diff --git a/trunk/drivers/gpu/drm/gma500/mmu.c b/trunk/drivers/gpu/drm/gma500/mmu.c index 7ba6af394cb5..c5dd4d202755 100644 --- a/trunk/drivers/gpu/drm/gma500/mmu.c +++ b/trunk/drivers/gpu/drm/gma500/mmu.c @@ -270,7 +270,7 @@ struct psb_mmu_pd *psb_mmu_alloc_pd(struct psb_mmu_driver *driver, return NULL; } -void psb_mmu_free_pt(struct psb_mmu_pt *pt) +static void psb_mmu_free_pt(struct psb_mmu_pt *pt) { __free_page(pt->p); kfree(pt); @@ -351,7 +351,7 @@ static struct psb_mmu_pt *psb_mmu_alloc_pt(struct psb_mmu_pd *pd) return pt; } -struct psb_mmu_pt *psb_mmu_pt_alloc_map_lock(struct psb_mmu_pd *pd, +static struct psb_mmu_pt *psb_mmu_pt_alloc_map_lock(struct psb_mmu_pd *pd, unsigned long addr) { uint32_t index = psb_mmu_pd_index(addr);