Merge branch 'master' of /home/aia21/ntfs-2.6/

[linux-2.6] / net / atm / resources.h

diff --git a/net/atm/resources.h b/net/atm/resources.h
index 12910619dbb6cdfed3cb5b56268769263125ad63..ac7222fee7a8e38db42aa066ca03a241ab323735 100644 (file)
--- a/net/atm/resources.h
+++ b/net/atm/resources.h
@@ -8,11 +8,11 @@
 
 #include <linux/config.h>
 #include <linux/atmdev.h>
+#include <linux/mutex.h>
 
 
 extern struct list_head atm_devs;
-extern spinlock_t atm_dev_lock;
-
+extern struct mutex atm_dev_mutex;
 
 int atm_dev_ioctl(unsigned int cmd, void __user *arg);