summaryrefslogtreecommitdiff
path: root/fs/omfs
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-04-23 02:08:44 +0200
committerJiri Kosina <jkosina@suse.cz>2010-04-23 02:08:44 +0200
commit6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch)
tree797676a336b050bfa1ef879377c07e541b9075d6 /fs/omfs
parent4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff)
parentc81eddb0e3728661d1585fbc564449c94165cc36 (diff)
downloadlinux-3.10-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.gz
linux-3.10-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.bz2
linux-3.10-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.zip
Merge branch 'master' into for-next
Diffstat (limited to 'fs/omfs')
-rw-r--r--fs/omfs/inode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index 2ff33ea5cb3..b44bb835e8e 100644
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -5,6 +5,7 @@
*/
#include <linux/module.h>
#include <linux/sched.h>
+#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/vfs.h>
#include <linux/parser.h>