diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/linux/fdtable.h | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/linux/fdtable.h')
| -rw-r--r-- | include/linux/fdtable.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index 09d6c5bbdddd..a2ec74bc4812 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h | |||
| @@ -5,12 +5,14 @@ | |||
| 5 | #ifndef __LINUX_FDTABLE_H | 5 | #ifndef __LINUX_FDTABLE_H |
| 6 | #define __LINUX_FDTABLE_H | 6 | #define __LINUX_FDTABLE_H |
| 7 | 7 | ||
| 8 | #include <asm/atomic.h> | ||
| 9 | #include <linux/posix_types.h> | 8 | #include <linux/posix_types.h> |
| 10 | #include <linux/compiler.h> | 9 | #include <linux/compiler.h> |
| 11 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
| 12 | #include <linux/rcupdate.h> | 11 | #include <linux/rcupdate.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | #include <linux/init.h> | ||
| 14 | |||
| 15 | #include <asm/atomic.h> | ||
| 14 | 16 | ||
| 15 | /* | 17 | /* |
| 16 | * The default fd array needs to be at least BITS_PER_LONG, | 18 | * The default fd array needs to be at least BITS_PER_LONG, |