diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
| commit | d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a (patch) | |
| tree | 250be7a5a29069f7d1f4524fa45ab0e988833025 /fs/splice.c | |
| parent | 490dea45d00f01847ebebd007685d564aaf2cd98 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into timers/urgent
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/splice.c b/fs/splice.c index 1abab5cee4b..a54b3e3f10a 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -21,6 +21,7 @@ #include <linux/file.h> #include <linux/pagemap.h> #include <linux/splice.h> +#include <linux/memcontrol.h> #include <linux/mm_inline.h> #include <linux/swap.h> #include <linux/writeback.h> |