diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /include/linux/nfs_idmap.h | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Diffstat (limited to 'include/linux/nfs_idmap.h')
| -rw-r--r-- | include/linux/nfs_idmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h index 15a9f3b7289a..91a1c24e0cbf 100644 --- a/include/linux/nfs_idmap.h +++ b/include/linux/nfs_idmap.h | |||
| @@ -37,6 +37,8 @@ | |||
| 37 | #ifndef NFS_IDMAP_H | 37 | #ifndef NFS_IDMAP_H |
| 38 | #define NFS_IDMAP_H | 38 | #define NFS_IDMAP_H |
| 39 | 39 | ||
| 40 | #include <linux/types.h> | ||
| 41 | |||
| 40 | /* XXX from bits/utmp.h */ | 42 | /* XXX from bits/utmp.h */ |
| 41 | #define IDMAP_NAMESZ 128 | 43 | #define IDMAP_NAMESZ 128 |
| 42 | 44 | ||