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

Signed-off-by: Steve French <[email protected]>
niw · Jul 19, 2007 · 70b315b · 70b315b
1 parent c18c842
commit 70b315b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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"