diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:32:25 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:32:25 -0400 |
| commit | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (patch) | |
| tree | d9dcd28077d30a324c526a7a0e5490f99b6ffaba | |
| parent | c18c842b1fdf527717303a4e173cbece7ab2deb8 (diff) | |
[CIFS] merge conflict in fs/cifs/export.c
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/export.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/export.c b/fs/cifs/export.c index 1570cc6dedd7..c21d3d09d0af 100644 --- a/fs/cifs/export.c +++ b/fs/cifs/export.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/fs.h> | 42 | #include <linux/fs.h> |
| 43 | #include <linux/exportfs.h> | ||
| 43 | #include "cifsglob.h" | 44 | #include "cifsglob.h" |
| 44 | #include "cifs_debug.h" | 45 | #include "cifs_debug.h" |
| 45 | 46 | ||