diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-09 20:19:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-09 20:19:50 -0700 |
| commit | d02a9a89db3437467de45a451739e520877f4a48 (patch) | |
| tree | a5cbd992bb3ee41470fbe6d5bbd16d4fdb960ef2 /drivers | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | crypto: ux500 - add missing comma (diff) | |
| download | linux-dev-d02a9a89db3437467de45a451739e520877f4a48.tar.xz linux-dev-d02a9a89db3437467de45a451739e520877f4a48.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a GCM bug that breaks IPsec and a compile problem in
ux500."
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ux500 - add missing comma
crypto: gcm - fix assumption that assoc has one segment
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/ux500/cryp/cryp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 8bc5fef07e7a..22c9063e0120 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c @@ -1750,7 +1750,7 @@ static struct platform_driver cryp_driver = { .shutdown = ux500_cryp_shutdown, .driver = { .owner = THIS_MODULE, - .name = "cryp1" + .name = "cryp1", .pm = &ux500_cryp_pm, } }; |