Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / fs / xfs / linux-2.6 / xfs_super.h

diff --git a/fs/xfs/linux-2.6/xfs_super.h b/fs/xfs/linux-2.6/xfs_super.h
index 3efcf45b14abed330cd482a8370b76c398572fde..3efb7c6d330352201bdb897d200b1f1e76ac295b 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_super.h
+++ b/fs/xfs/linux-2.6/xfs_super.h
@@ -50,13 +50,7 @@ extern void xfs_qm_exit(void);
 # define set_posix_acl_flag(sb)        do { } while (0)
 #endif
 
-#ifdef CONFIG_XFS_SECURITY
-# define XFS_SECURITY_STRING   "security attributes, "
-# define ENOSECURITY           0
-#else
-# define XFS_SECURITY_STRING
-# define ENOSECURITY           EOPNOTSUPP
-#endif
+#define XFS_SECURITY_STRING    "security attributes, "
 
 #ifdef CONFIG_XFS_RT
 # define XFS_REALTIME_STRING   "realtime, "