Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / affs / file.c

diff --git a/fs/affs/file.c b/fs/affs/file.c
index a91795e01a7ff0c0e85abf1bdf69f3d1d828b231..3aa7eb66547ea31b7556c1502d3900dce0aa80dd 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -12,7 +12,7 @@
  *  affs regular file handling primitives
  */
 
-#include <linux/aio.h>
+#include <linux/uio.h>
 #include "affs.h"
 
 static struct buffer_head *affs_get_extblock_slow(struct inode *inode, u32 ext);