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

Signed-off-by: Steve French <sfrench@us.ibm.com>

[CIFS] merge conflict in fs/cifs/export.c
Signed-off-by: Steve French <sfrench@us.ibm.com>
70b315b0 · Steve French · c18c842b · 70b315b0
Commit 70b315b0 authored Jul 19, 2007 by Steve French
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

fs/cifs/export.c fs/cifs/export.c +1 -0

No files found.
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@ -40,6 +40,7 @@
  */

 #include <linux/fs.h>
+#include <linux/exportfs.h>
 #include "cifsglob.h"
 #include "cifs_debug.h"