diff --git a/[refs] b/[refs] index 11a99ac46da4..56308bfba46e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd1a28e8457e6ebf72c48d84d4e736307e86436e +refs/heads/master: a033c332e047397904ed74816946b2edd9b0d5cd diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h index b26fbc715a50..2486eb4edbf1 100644 --- a/trunk/include/linux/lockdep.h +++ b/trunk/include/linux/lockdep.h @@ -278,14 +278,6 @@ extern void lockdep_init_map(struct lockdep_map *lock, const char *name, lockdep_init_map(&(lock)->dep_map, #lock, \ (lock)->dep_map.key, sub) -/* - * To initialize a lockdep_map statically use this macro. - * Note that _name must not be NULL. - */ -#define STATIC_LOCKDEP_MAP_INIT(_name, _key) \ - { .name = (_name), .key = (void *)(_key), } - - /* * Acquire a lock. *