Merge branch 'master' into upstream

[powerpc.git] / net / atm / resources.h

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