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

[karo-tx-linux.git] / include / linux / udf_fs_sb.h

diff --git a/include/linux/udf_fs_sb.h b/include/linux/udf_fs_sb.h
index b15ff2e99c91ff36a9c4a20fc719766914002f77..80ae9ef940dccaac300f187c5292d52d42d92bad 100644 (file)
--- a/include/linux/udf_fs_sb.h
+++ b/include/linux/udf_fs_sb.h
@@ -13,7 +13,7 @@
 #ifndef _UDF_FS_SB_H
 #define _UDF_FS_SB_H 1
 
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 #pragma pack(1)
 
@@ -111,7 +111,7 @@ struct udf_sb_info
        /* VAT inode */
        struct inode            *s_vat;
 
-       struct semaphore        s_alloc_sem;
+       struct mutex            s_alloc_mutex;
 };
 
 #endif /* _UDF_FS_SB_H */