Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / kernel / mutex.h

diff --git a/kernel/mutex.h b/kernel/mutex.h
index aeb2d916aa0e20eb84d57e39de34d5f311bb5a29..a075dafbb290c18bdf8972c361d8063f2478fa69 100644 (file)
--- a/kernel/mutex.h
+++ b/kernel/mutex.h
@@ -22,7 +22,7 @@
 #define debug_mutex_free_waiter(waiter)                        do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)       do { } while (0)
 #define debug_mutex_unlock(lock)                       do { } while (0)
-#define debug_mutex_init(lock, name)                   do { } while (0)
+#define debug_mutex_init(lock, name, key)              do { } while (0)
 
 static inline void
 debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)