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/isofs | |
| 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/isofs')
| -rw-r--r-- | fs/isofs/dir.c | 1 | ||||
| -rw-r--r-- | fs/isofs/namei.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 8ba5441..b9ab69b 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c @@ -11,6 +11,7 @@ * isofs directory handling functions */ #include <linux/smp_lock.h> +#include <linux/gfp.h> #include "isofs.h" int isofs_name_translate(struct iso_directory_record *de, char *new, struct inode *inode) diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c index eaa8313..ab438be 100644 --- a/fs/isofs/namei.c +++ b/fs/isofs/namei.c @@ -7,6 +7,7 @@ */ #include <linux/smp_lock.h> +#include <linux/gfp.h> #include "isofs.h" /* |