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 | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
tree | 797676a336b050bfa1ef879377c07e541b9075d6 /crypto/rng.c | |
parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
download | linux-stable-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.gz linux-stable-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.bz2 linux-stable-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.zip |
Merge branch 'master' into for-next
Diffstat (limited to 'crypto/rng.c')
-rw-r--r-- | crypto/rng.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/rng.c b/crypto/rng.c index ba05e7380e76..f93cb5311182 100644 --- a/crypto/rng.c +++ b/crypto/rng.c @@ -19,6 +19,7 @@ #include <linux/mutex.h> #include <linux/random.h> #include <linux/seq_file.h> +#include <linux/slab.h> #include <linux/string.h> static DEFINE_MUTEX(crypto_default_rng_lock); |