diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /include/linux/qnx4_fs.h | |
| parent | 889c92d21db40be0b7d22a59395060237895bb85 (diff) | |
| parent | 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 (diff) | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'include/linux/qnx4_fs.h')
| -rw-r--r-- | include/linux/qnx4_fs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/qnx4_fs.h b/include/linux/qnx4_fs.h index 34a196ee7941..787d19ea9f46 100644 --- a/include/linux/qnx4_fs.h +++ b/include/linux/qnx4_fs.h | |||
| @@ -2,14 +2,12 @@ | |||
| 2 | * Name : qnx4_fs.h | 2 | * Name : qnx4_fs.h |
| 3 | * Author : Richard Frowijn | 3 | * Author : Richard Frowijn |
| 4 | * Function : qnx4 global filesystem definitions | 4 | * Function : qnx4 global filesystem definitions |
| 5 | * Version : 1.0.2 | ||
| 6 | * Last modified : 2000-01-31 | ||
| 7 | * | ||
| 8 | * History : 23-03-1998 created | 5 | * History : 23-03-1998 created |
| 9 | */ | 6 | */ |
| 10 | #ifndef _LINUX_QNX4_FS_H | 7 | #ifndef _LINUX_QNX4_FS_H |
| 11 | #define _LINUX_QNX4_FS_H | 8 | #define _LINUX_QNX4_FS_H |
| 12 | 9 | ||
| 10 | #include <linux/types.h> | ||
| 13 | #include <linux/qnxtypes.h> | 11 | #include <linux/qnxtypes.h> |
| 14 | #include <linux/magic.h> | 12 | #include <linux/magic.h> |
| 15 | 13 | ||