Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / linux / ncp_fs_sb.h

diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index cf858eb80f0ba430ec2e932014bd7786057295f0..b089d95062835dd769c5c19bfb88361dec94edbe 100644 (file)
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/ncp_mount.h>
 #include <linux/net.h>
+#include <linux/mutex.h>
 
 #ifdef __KERNEL__
 
@@ -51,7 +52,7 @@ struct ncp_server {
                                   receive replies */
 
        int lock;               /* To prevent mismatch in protocols. */
-       struct semaphore sem;
+       struct mutex mutex;
 
        int current_size;       /* for packet preparation */
        int has_subfunction;
@@ -96,7 +97,7 @@ struct ncp_server {
        struct {
                struct work_struct tq;          /* STREAM/DGRAM: data/error ready */
                struct ncp_request_reply* creq; /* STREAM/DGRAM: awaiting reply from this request */
-               struct semaphore creq_sem;      /* DGRAM only: lock accesses to rcv.creq */
+               struct mutex creq_mutex;        /* DGRAM only: lock accesses to rcv.creq */
 
                unsigned int state;             /* STREAM only: receiver state */
                struct {