lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CIFS] merge conflict in fs/cifs/export.c

Browse Source 
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French
2007-07-19 00:32:25 +00:00
parent c18c842b1f
commit 70b315b0dd
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/cifs/export.c
View File

@@ -40,6 +40,7 @@
*/ */
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/exportfs.h>
#include "cifsglob.h" #include "cifsglob.h"
#include "cifs_debug.h" #include "cifs_debug.h"