diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 21:10:39 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 21:10:39 +0200 |
| commit | 7e95e365d5399647a41e10059e4b09826b82d78b (patch) | |
| tree | 305c9968798adae3d9484657339fa39d2a5fdaac /crypto/proc.c | |
| parent | 3ca9d1fc9aa64077645a26c396de9399b49ea226 (diff) | |
| parent | 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f (diff) | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/init.c
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 3808697814d7..4a0a7aad2204 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> |