diff --git a/[refs] b/[refs] index e01fba9e6aff..9bb13c28577f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53e974db655da7df6f1ac5db8da94cbeb288ab35 +refs/heads/master: 2dff52795746846ca0accb639037c26715da12d5 diff --git a/trunk/drivers/staging/tidspbridge/core/dsp-mmu.c b/trunk/drivers/staging/tidspbridge/core/dsp-mmu.c index 3c978f9c5824..983c95adc8ff 100644 --- a/trunk/drivers/staging/tidspbridge/core/dsp-mmu.c +++ b/trunk/drivers/staging/tidspbridge/core/dsp-mmu.c @@ -219,7 +219,8 @@ u32 user_to_dsp_map(struct iommu *mmu, u32 uva, u32 da, u32 size, struct page **usr_pgs) { int res, w; - unsigned pages, i; + unsigned pages; + int i; struct vm_area_struct *vma; struct mm_struct *mm = current->mm; struct sg_table *sgt;