From: Steve French <sfrench@us.ibm.com>
Date: Thu, 19 Jul 2007 00:32:25 +0000 (+0000)
Subject: [CIFS] merge conflict in fs/cifs/export.c
X-Git-Tag: v2.6.23-rc1~478^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3;p=linux-2.6-omap-h63xx.git

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

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

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"