From 90efbc766684bf316678433fdf62de97f9cbe6a5 Mon Sep 17 00:00:00 2001 From: Tracey Dent Date: Sun, 22 Jan 2012 21:28:44 -0500 Subject: [PATCH] --- yaml --- r: 288913 b: refs/heads/master c: aa5af974127d317071d6225a0f3678c5f520e7ce h: refs/heads/master i: 288911: 10b753f0c19bc8b0b5762ffb50edad0075323aa2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/ashmem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d6e7052036d3..5817a71e0e03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d438bef6556315a23781fd673f13f7bfb94047d +refs/heads/master: aa5af974127d317071d6225a0f3678c5f520e7ce diff --git a/trunk/drivers/staging/android/ashmem.c b/trunk/drivers/staging/android/ashmem.c index 99052bfd3a2d..9f1f27e7c86e 100644 --- a/trunk/drivers/staging/android/ashmem.c +++ b/trunk/drivers/staging/android/ashmem.c @@ -315,7 +315,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) get_file(asma->file); /* - * XXX - Reworked to use shmem_zero_setup() instead of + * XXX - Reworked to use shmem_zero_setup() instead of * shmem_set_file while we're in staging. -jstultz */ if (vma->vm_flags & VM_SHARED) { @@ -680,7 +680,7 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return ret; } -static struct file_operations ashmem_fops = { +static const struct file_operations ashmem_fops = { .owner = THIS_MODULE, .open = ashmem_open, .release = ashmem_release,