linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index b089d95..cf858eb 100644 (file)
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -11,7 +11,6 @@
 #include <linux/types.h>
 #include <linux/ncp_mount.h>
 #include <linux/net.h>
-#include <linux/mutex.h>
 
 #ifdef __KERNEL__
 
@@ -52,7 +51,7 @@ struct ncp_server {
                                   receive replies */
 
        int lock;               /* To prevent mismatch in protocols. */
-       struct mutex mutex;
+       struct semaphore sem;
 
        int current_size;       /* for packet preparation */
        int has_subfunction;
@@ -97,7 +96,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 mutex creq_mutex;        /* DGRAM only: lock accesses to rcv.creq */
+               struct semaphore creq_sem;      /* DGRAM only: lock accesses to rcv.creq */
 
                unsigned int state;             /* STREAM only: receiver state */
                struct {