diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-12 10:51:13 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-12 10:51:13 +0100 |
commit | 3572bfff3a58b312276b882c15b9f517a0c3c4ac (patch) | |
tree | 95df302ae8134263edc38067b03617fa19fb5635 /crypto/serpent_generic.c | |
parent | db85fba98caa6ea9e54e93b33df8fdbadf6d20df (diff) | |
parent | ad8b05dfadb938841880a3c05fd76e51af30b1f1 (diff) | |
download | linux-crypto-3572bfff3a58b312276b882c15b9f517a0c3c4ac.tar.gz linux-crypto-3572bfff3a58b312276b882c15b9f517a0c3c4ac.zip |
Merge tag 'irqchip-urgent-3.19' of git://git.infradead.org/users/jcooper/linux into irq/urgent
irqchip urgent fixes for v3.19 from Jason Cooper
- mtk-sysirq: Fix error handling
- hip04: Fix cpu map for 16bit value
- gic-v3-its: Clear a warning regarding decimal constants
- omap-intc: Fix legacy DMA regression
- atmel-aic-common: Retain priority when changing type
Diffstat (limited to 'crypto/serpent_generic.c')
-rw-r--r-- | crypto/serpent_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/serpent_generic.c b/crypto/serpent_generic.c index 7ddbd7e8..a53b5e2a 100644 --- a/crypto/serpent_generic.c +++ b/crypto/serpent_generic.c @@ -665,5 +665,5 @@ module_exit(serpent_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm"); MODULE_AUTHOR("Dag Arne Osvik <osvik@ii.uib.no>"); -MODULE_ALIAS("tnepres"); -MODULE_ALIAS("serpent"); +MODULE_ALIAS_CRYPTO("tnepres"); +MODULE_ALIAS_CRYPTO("serpent"); |