git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index
d537d29
..
ff8dc1a
100644
(file)
--- 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/shm
em_fs
.h>
#include <linux/blkdev.h>
#include <linux/random.h>
#include <linux/writeback.h>