diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 01:49:19 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 01:49:19 +0200 |
| commit | 879f99ef2c4c05d9a7f0a67a05f1415663119825 (patch) | |
| tree | 0399664761f675eef741f8b08b92635069586151 /crypto/crypto_wq.c | |
| parent | Input: pmic8xxx-pwrkey - set sane default for debounce time (diff) | |
| parent | Linux 3.15-rc5 (diff) | |
| download | linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.xz linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.zip | |
Merge tag 'v3.15-rc5' into next
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
Diffstat (limited to 'crypto/crypto_wq.c')
| -rw-r--r-- | crypto/crypto_wq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/crypto_wq.c b/crypto/crypto_wq.c index adad92a44ba2..2f1b8d12952a 100644 --- a/crypto/crypto_wq.c +++ b/crypto/crypto_wq.c @@ -33,7 +33,7 @@ static void __exit crypto_wq_exit(void) destroy_workqueue(kcrypto_wq); } -module_init(crypto_wq_init); +subsys_initcall(crypto_wq_init); module_exit(crypto_wq_exit); MODULE_LICENSE("GPL"); |