Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / linux / mutex.h

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index cc31498..2cb7531 100644 (file)
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -59,7 +59,6 @@ struct mutex {
        struct optimistic_spin_queue osq; /* Spinner MCS lock */
 #endif
 #ifdef CONFIG_DEBUG_MUTEXES
-       const char              *name;
        void                    *magic;
 #endif
 #ifdef CONFIG_DEBUG_LOCK_ALLOC