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/async_tx | |
| 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 '')
| -rw-r--r-- | crypto/async_tx/async_memcpy.c | 1 | ||||
| -rw-r--r-- | crypto/async_tx/async_pq.c | 1 | ||||
| -rw-r--r-- | crypto/async_tx/async_raid6_recov.c | 1 | ||||
| -rw-r--r-- | crypto/async_tx/async_tx.c | 1 | ||||
| -rw-r--r-- | crypto/async_tx/async_xor.c | 1 | ||||
| -rw-r--r-- | crypto/async_tx/raid6test.c | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c index 518c22bd..0d5a90ca 100644 --- a/crypto/async_tx/async_memcpy.c +++ b/crypto/async_tx/async_memcpy.c @@ -25,6 +25,7 @@ */ #include <linux/kernel.h> #include <linux/highmem.h> +#include <linux/module.h> #include <linux/mm.h> #include <linux/dma-mapping.h> #include <linux/async_tx.h> diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c index fdd8257d..91d5d385 100644 --- a/crypto/async_tx/async_pq.c +++ b/crypto/async_tx/async_pq.c @@ -21,6 +21,7 @@ */ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/module.h> #include <linux/dma-mapping.h> #include <linux/raid/pq.h> #include <linux/async_tx.h> diff --git a/crypto/async_tx/async_raid6_recov.c b/crypto/async_tx/async_raid6_recov.c index ce038d86..a9f08a6a 100644 --- a/crypto/async_tx/async_raid6_recov.c +++ b/crypto/async_tx/async_raid6_recov.c @@ -22,6 +22,7 @@ */ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/module.h> #include <linux/dma-mapping.h> #include <linux/raid/pq.h> #include <linux/async_tx.h> diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c index 7f2c00a4..84212097 100644 --- a/crypto/async_tx/async_tx.c +++ b/crypto/async_tx/async_tx.c @@ -24,6 +24,7 @@ * */ #include <linux/rculist.h> +#include <linux/module.h> #include <linux/kernel.h> #include <linux/async_tx.h> diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index bc28337f..154cc843 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -25,6 +25,7 @@ */ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/module.h> #include <linux/mm.h> #include <linux/dma-mapping.h> #include <linux/raid/xor.h> diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c index c88ff9e3..aa2b0270 100644 --- a/crypto/async_tx/raid6test.c +++ b/crypto/async_tx/raid6test.c @@ -23,6 +23,7 @@ #include <linux/gfp.h> #include <linux/mm.h> #include <linux/random.h> +#include <linux/module.h> #undef pr #define pr(fmt, args...) pr_info("raid6test: " fmt, ##args) |