Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / include / linux / ncp_fs_i.h

diff --git a/include/linux/ncp_fs_i.h b/include/linux/ncp_fs_i.h
index 415be1ec6f98127f1f83c7e6f1d3bf2558173f68..bdb4c8ae6924e4a0acc0ad123cd43cf8848f2721 100644 (file)
--- a/include/linux/ncp_fs_i.h
+++ b/include/linux/ncp_fs_i.h
@@ -19,7 +19,7 @@ struct ncp_inode_info {
        __le32  DosDirNum;
        __u8    volNumber;
        __le32  nwattr;
-       struct semaphore open_sem;
+       struct mutex open_mutex;
        atomic_t        opened;
        int     access;
        int     flags;