diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
|---|---|---|
| committer | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
| commit | 1c93dc3bd2d1f3f22f021b036c647db1316a7083 (patch) | |
| tree | 1678134117b42ea7af7d7b4c1f10e864d486ae25 /crypto/async_tx/async_pq.c | |
| parent | 39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff) | |
| parent | 30800d10f2872689cd78711f26b065494df8bb74 (diff) | |
| download | linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.tar.gz linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.zip | |
Merge mainline (v2.6.34-rc7)
Diffstat (limited to 'crypto/async_tx/async_pq.c')
| -rw-r--r-- | crypto/async_tx/async_pq.c | 1 |
1 files changed, 1 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 |