diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-19 17:51:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-19 17:51:42 +1000 |
| commit | 9c34ad2933910aa02e387e161845fb64cad3b002 (patch) | |
| tree | ef357700575b0fb1f2cb707dec6f8b3cbf669b22 /drivers/staging/pohmelfs/crypto.c | |
| parent | 1e4467c780b7b7639bf3d713dc49a1a3b875c7c5 (diff) | |
| parent | 48b83441aa08a72bb579872d2bf21734b0a26ce2 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/rt2860/common/mlme.c
drivers/staging/rt2870/common/mlme.c
drivers/staging/rt3070/common/mlme.c
Diffstat (limited to 'drivers/staging/pohmelfs/crypto.c')
| -rw-r--r-- | drivers/staging/pohmelfs/crypto.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/pohmelfs/crypto.c b/drivers/staging/pohmelfs/crypto.c index 31d765de92ce..19781ad782fb 100644 --- a/drivers/staging/pohmelfs/crypto.c +++ b/drivers/staging/pohmelfs/crypto.c @@ -832,8 +832,7 @@ int pohmelfs_trans_crypt(struct netfs_trans *trans, struct pohmelfs_sb *psb) return pohmelfs_crypto_thread_get(psb, pohmelfs_trans_crypt_action, trans); } -struct pohmelfs_crypto_input_action_data -{ +struct pohmelfs_crypto_input_action_data { struct page *page; struct pohmelfs_crypto_engine *e; u64 iv; |