Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[sfrench/cifs-2.6.git] / include / linux / aio.h

diff --git a/include/linux/aio.h b/include/linux/aio.h
index b903fc02bdb7dbc5f95a041dbba4dab24bb67e7c..d10e608f232d04e053aa3c2bd8b68a810df6aad8 100644 (file)
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -86,7 +86,7 @@ struct kioctx;
  */
 struct kiocb {
        struct list_head        ki_run_list;
-       long                    ki_flags;
+       unsigned long           ki_flags;
        int                     ki_users;
        unsigned                ki_key;         /* id of this request */