diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-01-06 15:49:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 15:49:08 +0900 |
| commit | fa94ddea2b29fdda7640672c8a933dbd901f0278 (patch) | |
| tree | 4e9204f1438f5ed44bff31e2abee598ad775321d /include/linux/namei.h | |
| parent | sh: select HAVE_HW_BREAKPOINT for all SUPERH32 CPUs. (diff) | |
| parent | sh: Fix up nommu build for out-of-line pgtable changes. (diff) | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'include/linux/namei.h')
| -rw-r--r-- | include/linux/namei.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/namei.h b/include/linux/namei.h index 028946750289..05b441d93642 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -72,8 +72,6 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, int (*open)(struct inode *, struct file *)); -extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); -extern void release_open_intent(struct nameidata *); extern struct dentry *lookup_one_len(const char *, struct dentry *, int); |