diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 05:56:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 05:56:27 +0300 |
| commit | 9fbf0c08d441888b977f7c459c8aa57f2c0cb6ad (patch) | |
| tree | 000bfa464562b2432e7f9e7c371a40f4f24e4c7a /fs/cifs/smbdes.c | |
| parent | 4fda116852fe21a3897c478ce64b77bb1ec6b3d6 (diff) | |
| parent | ee2c9258501f83d3ed0fd09ce5df1cec53312cf0 (diff) | |
| download | linux-9fbf0c08d441888b977f7c459c8aa57f2c0cb6ad.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: More crypto cleanup (try #2)
CIFS: Add strictcache mount option
CIFS: Implement cifs_strict_writev (try #4)
[CIFS] Replace cifs md5 hashing functions with kernel crypto APIs
Diffstat (limited to 'fs/cifs/smbdes.c')
| -rw-r--r-- | fs/cifs/smbdes.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/cifs/smbdes.c b/fs/cifs/smbdes.c index b6b6dcb500bf..04721485925d 100644 --- a/fs/cifs/smbdes.c +++ b/fs/cifs/smbdes.c @@ -45,7 +45,6 @@ up with a different answer to the one above) */ #include <linux/slab.h> -#include "cifsencrypt.h" #define uchar unsigned char static uchar perm1[56] = { 57, 49, 41, 33, 25, 17, 9, |