Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

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

diff --git a/include/linux/ncp_fs_i.h b/include/linux/ncp_fs_i.h
index 415be1ec6f98127f1f83c7e6f1d3bf2558173f68..4b0bec477846730ed8263c3ad097b3572e839e7d 100644 (file)
--- a/include/linux/ncp_fs_i.h
+++ b/include/linux/ncp_fs_i.h
@@ -8,8 +8,6 @@
 #ifndef _LINUX_NCP_FS_I
 #define _LINUX_NCP_FS_I
 
-#ifdef __KERNEL__
-
 /*
  * This is the ncpfs part of the inode structure. This must contain
  * all the information we need to work with an inode after creation.
@@ -19,7 +17,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;
@@ -28,6 +26,4 @@ struct ncp_inode_info {
        struct inode vfs_inode;
 };
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_NCP_FS_I */