Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / fs / dquot.c

diff --git a/fs/dquot.c b/fs/dquot.c
index b973233..05f3327 100644 (file)
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -500,7 +500,7 @@ static void prune_dqcache(int count)
  * more memory
  */
 
-static int shrink_dqcache_memory(int nr, unsigned int gfp_mask)
+static int shrink_dqcache_memory(int nr, gfp_t gfp_mask)
 {
        if (nr) {
                spin_lock(&dq_list_lock);