diff options
author | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:11:50 +1000 |
---|---|---|
committer | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:11:50 +1000 |
commit | 5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch) | |
tree | a1f22225aace571661c29e59ebd024bc4619e054 /include/linux/dcache.h | |
parent | 1fe797e67fb07d605b82300934d0de67068a0aca (diff) | |
parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) | |
download | blackbird-op-linux-5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97.tar.gz blackbird-op-linux-5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97.zip |
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/dcache.h')
-rw-r--r-- | include/linux/dcache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 2a6639407c80..d982eb89c77d 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -300,7 +300,7 @@ extern int d_validate(struct dentry *, struct dentry *); extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...); extern char *__d_path(const struct path *path, struct path *root, char *, int); -extern char *d_path(struct path *, char *, int); +extern char *d_path(const struct path *, char *, int); extern char *dentry_path(struct dentry *, char *, int); /* Allocation counts.. */ |