From a7ef58f3458f634aa50dd4e624174a2cf1bbd299 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@google.com>
Date: Sat, 21 Aug 2010 17:25:42 -0700
Subject: [PATCH] --- yaml --- r: 281211 b: refs/heads/master c:
 06a1074e1c789a777732f8c432d913b0fedb8ff5 h: refs/heads/master i:   281209:
 305205925d04d54598609f9b78eb803be27d328a   281207:
 60952ca1328c00a34e0cdfb224e73f43dd87ef67 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/android/lowmemorykiller.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d400164761bf..9b4ff3bf903a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb943f6be011b33455b767880e13c34a2bb96a5e
+refs/heads/master: 06a1074e1c789a777732f8c432d913b0fedb8ff5
diff --git a/trunk/drivers/staging/android/lowmemorykiller.c b/trunk/drivers/staging/android/lowmemorykiller.c
index cf79eb9677fe..93a1758b5c08 100644
--- a/trunk/drivers/staging/android/lowmemorykiller.c
+++ b/trunk/drivers/staging/android/lowmemorykiller.c
@@ -79,7 +79,7 @@ task_notify_func(struct notifier_block *self, unsigned long val, void *data)
 	return NOTIFY_OK;
 }
 
-static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
+static int lowmem_shrink(struct shrinker *s, int nr_to_scan, gfp_t gfp_mask)
 {
 	struct task_struct *p;
 	struct task_struct *selected = NULL;