diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
| commit | e55d4fa96762fd767a3b6d842c904e994db6bb2e (patch) | |
| tree | c74157e01cb128cb97f106a50cfadc4c8b872c41 /mm/swapfile.c | |
| parent | e32c14667e4fe9f16ac9b918d15d29abd2315a55 (diff) | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
| download | kernel_samsung_crespo-e55d4fa96762fd767a3b6d842c904e994db6bb2e.zip kernel_samsung_crespo-e55d4fa96762fd767a3b6d842c904e994db6bb2e.tar.gz kernel_samsung_crespo-e55d4fa96762fd767a3b6d842c904e994db6bb2e.tar.bz2 | |
Merge commit 'v3.0-rc5' into android-3.0
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index d537d29..ff8dc1a 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -14,7 +14,7 @@ #include <linux/vmalloc.h> #include <linux/pagemap.h> #include <linux/namei.h> -#include <linux/shm.h> +#include <linux/shmem_fs.h> #include <linux/blkdev.h> #include <linux/random.h> #include <linux/writeback.h> |