Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / fs / xfs / support / move.c

diff --git a/fs/xfs/support/move.c b/fs/xfs/support/move.c
index caefa17b80feafedbfa2aefa5b2b9b38d7fda0bd..ac8617ca3909a27ca620984e4c81280e009568c5 100644 (file)
--- a/fs/xfs/support/move.c
+++ b/fs/xfs/support/move.c
@@ -22,7 +22,7 @@
  * as we go.
  */
 int
-uio_read(caddr_t src, size_t len, struct uio *uio)
+xfs_uio_read(caddr_t src, size_t len, struct uio *uio)
 {
        size_t  count;