diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 00:08:44 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 00:08:44 (GMT) |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /fs/jffs2/file.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
| download | linux-fsl-qoriq-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.xz | |
Merge branch 'master' into for-next
Diffstat (limited to 'fs/jffs2/file.c')
| -rw-r--r-- | fs/jffs2/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index b7b74e2..e7291c1 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -10,7 +10,6 @@ */ #include <linux/kernel.h> -#include <linux/slab.h> #include <linux/fs.h> #include <linux/time.h> #include <linux/pagemap.h> |