diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 02:08:44 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 02:08:44 +0200 |
| commit | 6ea66e49cd8ef1e4ebb40936a127a487f8120d2d (patch) | |
| tree | 853eb8314f971140bdbc91f97ef6d9741f209d9a /crypto/tcrypt.c | |
| parent | bf66a6eb0419533dc34e0736faf4d9dcd7c1bf74 (diff) | |
| parent | 39e2874347a89696ff49f151a03b0af6d8428dee (diff) | |
| download | linux-crypto-6ea66e49cd8ef1e4ebb40936a127a487f8120d2d.tar.gz linux-crypto-6ea66e49cd8ef1e4ebb40936a127a487f8120d2d.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'crypto/tcrypt.c')
| -rw-r--r-- | crypto/tcrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index aa3f84cc..a3515994 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -18,8 +18,8 @@ #include <crypto/hash.h> #include <linux/err.h> #include <linux/init.h> +#include <linux/gfp.h> #include <linux/module.h> -#include <linux/slab.h> #include <linux/scatterlist.h> #include <linux/string.h> #include <linux/moduleparam.h> |