diff --git a/[refs] b/[refs] index f11cf0d7512f..f8fc89044a61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02a93208edec0d655c9f18613d830dc6afeda7d4 +refs/heads/master: 74add80cbd7fe246c893b93ee75ac59acdd01dd4 diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c index 52646d61ff69..cc1f543eb1b8 100644 --- a/trunk/mm/mmap.c +++ b/trunk/mm/mmap.c @@ -1366,7 +1366,6 @@ unsigned long get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) { - unsigned long ret; unsigned long (*get_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);