[XFS] Fix merge failures

[pandora-kernel.git] / fs / xfs / linux-2.6 / xfs_cred.h

diff --git a/fs/xfs/linux-2.6/xfs_cred.h b/fs/xfs/linux-2.6/xfs_cred.h
index e279d00..55bddf3 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_cred.h
+++ b/fs/xfs/linux-2.6/xfs_cred.h
@@ -23,8 +23,6 @@
 /*
  * Credentials
  */
-typedef struct cred {
-       /* EMPTY */
-} cred_t;
+typedef const struct cred cred_t;
 
 #endif  /* __XFS_CRED_H__ */