diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-19 02:38:57 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-19 02:38:57 +0200 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /fs/cifs/export.c | |
| parent | [CIFS] merge conflict in fs/cifs/export.c (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hsk... (diff) | |
| download | linux-1ff8392c32a2645d2665ca779ecb91bb29361c13.tar.xz linux-1ff8392c32a2645d2665ca779ecb91bb29361c13.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'fs/cifs/export.c')
| -rw-r--r-- | fs/cifs/export.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/export.c b/fs/cifs/export.c index c21d3d09d0af..893fd0aebff8 100644 --- a/fs/cifs/export.c +++ b/fs/cifs/export.c @@ -44,9 +44,7 @@ #include "cifsglob.h" #include "cifs_debug.h" - #ifdef CONFIG_CIFS_EXPERIMENTAL - static struct dentry *cifs_get_parent(struct dentry *dentry) { /* BB need to add code here eventually to enable export via NFSD */ |