]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[CIFS] merge conflict in fs/cifs/export.c
authorSteve French <sfrench@us.ibm.com>
Thu, 19 Jul 2007 00:32:25 +0000 (00:32 +0000)
committerSteve French <sfrench@us.ibm.com>
Thu, 19 Jul 2007 00:32:25 +0000 (00:32 +0000)
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/export.c

index 1570cc6dedd77cf89956fe37b95a2ca1f408209f..c21d3d09d0afea5a056cb7c420eb85b8d226b458 100644 (file)
@@ -40,6 +40,7 @@
   */
 
 #include <linux/fs.h>
+#include <linux/exportfs.h>
 #include "cifsglob.h"
 #include "cifs_debug.h"