---

yaml --- r: 306139 b: refs/heads/master c: 7cfce77 h: refs/heads/master i: 306137: 79e11ac 306135: bc24095 v: v3
git-mirror · Apr 10, 2012 · 27d4ffd · 27d4ffd
1 parent e5ed4f3
commit 27d4ffd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72da1f20afae1bd3f7ee4a27b2b8cda8838d61ef
+refs/heads/master: 7cfce77d779f43299c1cfeddd72462fed596c168
diff --git a/trunk/drivers/media/video/omap3isp/ispqueue.h b/trunk/drivers/media/video/omap3isp/ispqueue.h
@@ -90,7 +90,7 @@ struct isp_video_buffer {
 	void *vaddr;
 
 	/* For userspace buffers. */
-	unsigned long vm_flags;
+	vm_flags_t vm_flags;
 	unsigned long offset;
 	unsigned int npages;
 	struct page **pages;

diff --git a/trunk/drivers/staging/android/ashmem.c b/trunk/drivers/staging/android/ashmem.c
@@ -269,7 +269,7 @@ static loff_t ashmem_llseek(struct file *file, loff_t offset, int origin)
 	return ret;
 }
 
-static inline unsigned long calc_vm_may_flags(unsigned long prot)
+static inline vm_flags_t calc_vm_may_flags(unsigned long prot)
 {
 	return _calc_vm_trans(prot, PROT_READ,  VM_MAYREAD) |
 	       _calc_vm_trans(prot, PROT_WRITE, VM_MAYWRITE) |