diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-10-28 16:39:24 +0200 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 09:02:15 -0700 |
| commit | b31d42a5af1818bdf31a5f023abe4d8b212542f2 (patch) | |
| tree | 50e7a8f4a275349ddb5902690533ed5b3deabef4 /include | |
| parent | Merge git://git.infradead.org/battery-2.6 (diff) | |
| download | linux-dev-b31d42a5af1818bdf31a5f023abe4d8b212542f2.tar.xz linux-dev-b31d42a5af1818bdf31a5f023abe4d8b212542f2.zip | |
Fix compile brekage with !CONFIG_BLOCK
Today's git tree fails to build on !CONFIG_BLOCK, due to upstream commit
367a51a33902 ("fs: Add FITRIM ioctl"):
include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’
include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’
include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’
The commit adds uint64_t type usage to fs.h, but linux/types.h is not included
explicitly - it's only included implicitly via linux/blk_types.h, and there only if
CONFIG_BLOCK is enabled.
Add the explicit #include to fix this.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 6ed7ace74b7c..1c73b50e81ff 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -9,6 +9,7 @@ #include <linux/limits.h> #include <linux/ioctl.h> #include <linux/blk_types.h> +#include <linux/types.h> /* * It's silly to have NR_OPEN bigger than NR_FILE, but you can change |