diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 13:37:29 -0700 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 13:37:29 -0700 |
| commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
| tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /drivers/misc/ibmasm/ibmasmfs.c | |
| parent | a36d515c7a2dfacebcf41729f6812dbc424ebcf0 (diff) | |
| parent | a9743fcdc0eb43d028b71267438076e1b0112ba0 (diff) | |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'drivers/misc/ibmasm/ibmasmfs.c')
| -rw-r--r-- | drivers/misc/ibmasm/ibmasmfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index aecf40ecb3a4..8844a3f45381 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c @@ -75,6 +75,7 @@ #include <linux/fs.h> #include <linux/pagemap.h> +#include <linux/slab.h> #include <asm/uaccess.h> #include <asm/io.h> #include "ibmasm.h" |