diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /include/linux/aio.h | |
| parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
| parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'include/linux/aio.h')
| -rw-r--r-- | include/linux/aio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h index b51ddd28444e..09b276c35227 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/uio.h> | 7 | #include <linux/uio.h> |
| 8 | 8 | ||
| 9 | #include <asm/atomic.h> | 9 | #include <asm/atomic.h> |
| 10 | #include <linux/uio.h> | ||
| 11 | 10 | ||
| 12 | #define AIO_MAXSEGS 4 | 11 | #define AIO_MAXSEGS 4 |
| 13 | #define AIO_KIOGRP_NR_ATOMIC 8 | 12 | #define AIO_KIOGRP_NR_ATOMIC 8 |