diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /crypto/algapi.c | |
| parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
| parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'crypto/algapi.c')
| -rw-r--r-- | crypto/algapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index e8d3a7dca8c4..71a8143e23b1 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c | |||
| @@ -509,8 +509,8 @@ static struct crypto_template *__crypto_lookup_template(const char *name) | |||
| 509 | 509 | ||
| 510 | struct crypto_template *crypto_lookup_template(const char *name) | 510 | struct crypto_template *crypto_lookup_template(const char *name) |
| 511 | { | 511 | { |
| 512 | return try_then_request_module(__crypto_lookup_template(name), "%s", | 512 | return try_then_request_module(__crypto_lookup_template(name), |
| 513 | name); | 513 | "crypto-%s", name); |
| 514 | } | 514 | } |
| 515 | EXPORT_SYMBOL_GPL(crypto_lookup_template); | 515 | EXPORT_SYMBOL_GPL(crypto_lookup_template); |
| 516 | 516 | ||