diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 16:37:29 -0400 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 16:37:29 -0400 |
| commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
| tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /fs/devpts | |
| 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 'fs/devpts')
| -rw-r--r-- | fs/devpts/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 8882ecc0f1bf..0120247b41c0 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/namei.h> | 17 | #include <linux/namei.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/mount.h> | 19 | #include <linux/mount.h> |
| 19 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 20 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |