diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /fs/xfs/linux-2.6/xfs_ioctl.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index 4ea1ee18aded..7b26cc2fd284 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/mount.h> | 58 | #include <linux/mount.h> |
| 59 | #include <linux/namei.h> | 59 | #include <linux/namei.h> |
| 60 | #include <linux/pagemap.h> | 60 | #include <linux/pagemap.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | #include <linux/exportfs.h> | 62 | #include <linux/exportfs.h> |
| 62 | 63 | ||
| 63 | /* | 64 | /* |