summaryrefslogtreecommitdiff
path: root/net/irda/iriap.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-06-21 09:29:08 +0400
committerDavid S. Miller <davem@davemloft.net>2011-06-21 09:29:08 +0400
commit9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch)
treead8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /net/irda/iriap.c
parent4aa3a715551c93eda32d79bd52042ce500bd5383 (diff)
parent56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff)
downloadlinux-9f6ec8d697c08963d83880ccd35c13c5ace716ea.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'net/irda/iriap.c')
-rw-r--r--net/irda/iriap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index dfc7b47d48fe..e71e85ba2bf1 100644
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -87,6 +87,8 @@ static inline void iriap_start_watchdog_timer(struct iriap_cb *self,
iriap_watchdog_timer_expired);
}
+static struct lock_class_key irias_objects_key;
+
/*
* Function iriap_init (void)
*
@@ -114,6 +116,9 @@ int __init iriap_init(void)
return -ENOMEM;
}
+ lockdep_set_class_and_name(&irias_objects->hb_spinlock, &irias_objects_key,
+ "irias_objects");
+
/*
* Register some default services for IrLMP
*/