aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/export.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-07-18 20:32:25 -0400
committerSteve French <sfrench@us.ibm.com>2007-07-18 20:32:25 -0400
commit70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (patch)
treed9dcd28077d30a324c526a7a0e5490f99b6ffaba /fs/cifs/export.c
parentc18c842b1fdf527717303a4e173cbece7ab2deb8 (diff)
[CIFS] merge conflict in fs/cifs/export.c
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/export.c')
-rw-r--r--fs/cifs/export.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/export.c b/fs/cifs/export.c
index 1570cc6dedd7..c21d3d09d0af 100644
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@ -40,6 +40,7 @@
40 */ 40 */
41 41
42#include <linux/fs.h> 42#include <linux/fs.h>
43#include <linux/exportfs.h>
43#include "cifsglob.h" 44#include "cifsglob.h"
44#include "cifs_debug.h" 45#include "cifs_debug.h"
45 46