From: Ingo Molnar Date: Thu, 28 Oct 2010 14:39:24 +0000 (+0200) Subject: Fix compile brekage with !CONFIG_BLOCK X-Git-Tag: v2.6.37-rc1~73 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=b31d42a5af1818bdf31a5f023abe4d8b212542f2;p=net-next-2.6.git 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 Signed-off-by: Linus Torvalds --- diff --git a/include/linux/fs.h b/include/linux/fs.h index 6ed7ace74b7..1c73b50e81f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -9,6 +9,7 @@ #include #include #include +#include /* * It's silly to have NR_OPEN bigger than NR_FILE, but you can change