diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 15:29:07 +0100 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 15:29:07 +0100 |
commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /fs/xfs/xfs_dmapi.h | |
parent | [SCSI] qla2xxx: Update version number to 8.01.03-k. (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
download | linux-8a87a0b6313109d2fea87b1271d497c954ce2ca8.tar.xz linux-8a87a0b6313109d2fea87b1271d497c954ce2ca8.zip |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'fs/xfs/xfs_dmapi.h')
-rw-r--r-- | fs/xfs/xfs_dmapi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_dmapi.h b/fs/xfs/xfs_dmapi.h index 5a5c7a63e80b..864bf6955689 100644 --- a/fs/xfs/xfs_dmapi.h +++ b/fs/xfs/xfs_dmapi.h @@ -18,6 +18,7 @@ #ifndef __XFS_DMAPI_H__ #define __XFS_DMAPI_H__ +#include <linux/version.h> /* Values used to define the on-disk version of dm_attrname_t. All * on-disk attribute names start with the 8-byte string "SGI_DMI_". * |