diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-03 11:28:58 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-03 11:28:58 +0800 |
| commit | fa09798e8294e18c391c7aa2586977bb6262957e (patch) | |
| tree | 6138c7cddf9c5e664f157eb1bfaec03988198ed6 /crypto/async_tx | |
| parent | a8f23ef06f619971e6a949ed7d4037820dbd4517 (diff) | |
| parent | 9fb5d8ad81e452c5229dc9405dd2dbd08c96c74b (diff) | |
| download | linux-crypto-fa09798e8294e18c391c7aa2586977bb6262957e.tar.gz linux-crypto-fa09798e8294e18c391c7aa2586977bb6262957e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'crypto/async_tx')
| -rw-r--r-- | crypto/async_tx/async_pq.c | 1 | ||||
| -rw-r--r-- | crypto/async_tx/raid6test.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c index ec87f53d..fdd8257d 100644 --- a/crypto/async_tx/async_pq.c +++ b/crypto/async_tx/async_pq.c @@ -24,6 +24,7 @@ #include <linux/dma-mapping.h> #include <linux/raid/pq.h> #include <linux/async_tx.h> +#include <linux/gfp.h> /** * pq_scribble_page - space to hold throwaway P or Q buffer for diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c index f84f6b43..c1321935 100644 --- a/crypto/async_tx/raid6test.c +++ b/crypto/async_tx/raid6test.c @@ -20,6 +20,7 @@ * */ #include <linux/async_tx.h> +#include <linux/gfp.h> #include <linux/random.h> #undef pr |