diff --git a/[refs] b/[refs] index d9ab3073f2ad..7bbf7eb6f4a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 067006a5f5b956fbdd183f9b799e7b8059b53f6c +refs/heads/master: 43cc960980760f58d1f49ecd39e8cbfb063d63e1 diff --git a/trunk/include/linux/aio.h b/trunk/include/linux/aio.h index 47f7d932a01d..aea219d7d8d1 100644 --- a/trunk/include/linux/aio.h +++ b/trunk/include/linux/aio.h @@ -225,8 +225,6 @@ static inline void exit_aio(struct mm_struct *mm) { } #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait) -#include - static inline struct kiocb *list_kiocb(struct list_head *h) { return list_entry(h, struct kiocb, ki_list);