[CIFS] merge conflict in fs/cifs/export.c · 70b315b0dd - Gogs

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

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

Steve French 18 years ago

parent

c18c842b1f

commit

70b315b0dd

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
fs/cifs/export.c
							 
								View File
							
				@@ -40,6 +40,7 @@
			
				   */
			
				 #include <linux/fs.h>
			
				+#include <linux/exportfs.h>
			
				 #include "cifsglob.h"
			
				 #include "cifs_debug.h"