diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 00:11:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 00:11:28 +0300 |
| commit | c6906a2cb7cc318a56f6c335a2c4a3b004dd9e04 (patch) | |
| tree | 387eb7a58f56e5138040831fe931ff067cebb947 /include | |
| parent | 8903709b054a8dafe4e8c6d9a6444034d7aba36f (diff) | |
| parent | baa91878ab9b0f1cdb7ab03b53ee2e4389245644 (diff) | |
| download | linux-c6906a2cb7cc318a56f6c335a2c4a3b004dd9e04.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: fix typos (s/bin_shipped/bin.o_shipped/) in Documentation
kbuild: add a symlink to the source for separate objdirs
kconfig: add script to manipulate .config files on the command line
kbuild: reintroduce ALLSOURCE_ARCHS support for tags/cscope
bootchart: improve output based on Dave Jones' feedback
fix modules_install via NFS
qnx: include <linux/types.h> for definitions of __[us]{8,16,32,64} types
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/qnx4_fs.h | 4 | ||||
| -rw-r--r-- | include/linux/qnxtypes.h | 5 |
2 files changed, 3 insertions, 6 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 @@ * Name : qnx4_fs.h * Author : Richard Frowijn * Function : qnx4 global filesystem definitions - * Version : 1.0.2 - * Last modified : 2000-01-31 - * * History : 23-03-1998 created */ #ifndef _LINUX_QNX4_FS_H #define _LINUX_QNX4_FS_H +#include <linux/types.h> #include <linux/qnxtypes.h> #include <linux/magic.h> diff --git a/include/linux/qnxtypes.h b/include/linux/qnxtypes.h index a3eb1137857b..bebbe5cc4fb8 100644 --- a/include/linux/qnxtypes.h +++ b/include/linux/qnxtypes.h @@ -2,9 +2,6 @@ * Name : qnxtypes.h * Author : Richard Frowijn * Function : standard qnx types - * Version : 1.0.2 - * Last modified : 2000-01-06 - * * History : 22-03-1998 created * */ @@ -12,6 +9,8 @@ #ifndef _QNX4TYPES_H #define _QNX4TYPES_H +#include <linux/types.h> + typedef __le16 qnx4_nxtnt_t; typedef __u8 qnx4_ftype_t; |