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

Signed-off-by: Steve French <sfrench@us.ibm.com>
2007-07-19 00:32:25 +00:00 · 2007-07-19 00:32:25 +00:00 · 70b315b0dd
parent c18c842b1f
commit 70b315b0dd
1 changed files with 1 additions and 0 deletions
--- 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"