diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 02:08:44 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 02:08:44 +0200 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /fs/ubifs/file.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
| download | kernel_samsung_espresso10-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.zip kernel_samsung_espresso10-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.gz kernel_samsung_espresso10-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.bz2 | |
Merge branch 'master' into for-next
Diffstat (limited to 'fs/ubifs/file.c')
| -rw-r--r-- | fs/ubifs/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index e26c02a..5692cf7 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -52,6 +52,7 @@ #include "ubifs.h" #include <linux/mount.h> #include <linux/namei.h> +#include <linux/slab.h> static int read_block(struct inode *inode, void *addr, unsigned int block, struct ubifs_data_node *dn) |