diff options
| author | Dan Streetman <ddstreet@ieee.org> | 2015-07-22 20:26:37 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-07-23 12:14:32 +0200 |
| commit | 174d66d4725879b80f8af0bda2b218c2892a9ddb (patch) | |
| tree | e4a84127f3541dd6379e47eaaa33bb3b8436c6b0 /drivers/crypto | |
| parent | crypto: nx - merge nx-compress and nx-compress-crypto (diff) | |
| download | linux-174d66d4725879b80f8af0bda2b218c2892a9ddb.tar.xz linux-174d66d4725879b80f8af0bda2b218c2892a9ddb.zip | |
crypto: nx - rename nx-842-crypto.c to nx-842.c
The last commit merged nx-842.c's code into nx-842-crypto.c. It
did not rename nx-842-crypto.c to nx-842.c, in order to let the
patch more clearly show what was merged. This just renames
nx-842-crypto.c to nx-842.c, with no changes to its code.
Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/nx/Makefile | 2 | ||||
| -rw-r--r-- | drivers/crypto/nx/nx-842.c (renamed from drivers/crypto/nx/nx-842-crypto.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/nx/Makefile b/drivers/crypto/nx/Makefile index e29ee85b2431..ffcc86c44e15 100644 --- a/drivers/crypto/nx/Makefile +++ b/drivers/crypto/nx/Makefile @@ -13,7 +13,7 @@ nx-crypto-objs := nx.o \ obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS) += nx-compress.o nx-compress-platform.o obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES) += nx-compress-pseries.o obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV) += nx-compress-powernv.o -nx-compress-objs := nx-842-crypto.o +nx-compress-objs := nx-842.o nx-compress-platform-objs := nx-842-platform.o nx-compress-pseries-objs := nx-842-pseries.o nx-compress-powernv-objs := nx-842-powernv.o diff --git a/drivers/crypto/nx/nx-842-crypto.c b/drivers/crypto/nx/nx-842.c index 4472e2001e79..4472e2001e79 100644 --- a/drivers/crypto/nx/nx-842-crypto.c +++ b/drivers/crypto/nx/nx-842.c |