From 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Thu, 19 Jul 2007 00:32:25 +0000
Subject: [PATCH] [CIFS] merge conflict in fs/cifs/export.c

Signed-off-by: Steve French <sfrench@us.ibm.com>
---
 fs/cifs/export.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/cifs/export.c b/fs/cifs/export.c
index 1570cc6dedd..c21d3d09d0a 100644
--- 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"
 
-- 
2.41.1