diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 20:55:35 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 20:55:53 +0100 |
| commit | 603b764c218374f7a095862284fc9a1561820ac6 (patch) | |
| tree | 9476abc36326af0afa520628be83d0e62a67dae2 /crypto/proc.c | |
| parent | 3af3040902f81ba7437477b94f5e9c6c1030af7a (diff) | |
| parent | 3a8e62536f9489f46ac17a6168836ac5cebeda01 (diff) | |
| download | linux-crypto-603b764c218374f7a095862284fc9a1561820ac6.tar.gz linux-crypto-603b764c218374f7a095862284fc9a1561820ac6.zip | |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'crypto/proc.c')
| -rw-r--r-- | crypto/proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/proc.c b/crypto/proc.c index 38086978..4a0a7aad 100644 --- a/crypto/proc.c +++ b/crypto/proc.c @@ -16,6 +16,7 @@ #include <linux/atomic.h> #include <linux/init.h> #include <linux/crypto.h> +#include <linux/module.h> /* for module_name() */ #include <linux/rwsem.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> |