X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fcore%2Flink_watch.c;h=4859b7446c6fce484b92d53a853b0a5c9e31d02e;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=6dd61ea39b2d859945c4f00d18ddb56cf6cba6b4;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 6dd61ea39..4859b7446 100644
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -22,7 +22,7 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/types.h>
 
 
@@ -38,7 +38,7 @@ static void linkwatch_event(void *dummy);
 static DECLARE_WORK(linkwatch_work, linkwatch_event, NULL);
 
 static LIST_HEAD(lweventlist);
-static spinlock_t lweventlist_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lweventlist_lock);
 
 struct lw_event {
 	struct list_head list;