Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: cavium - Move cpt and nitrox rules into cavium Makefile

Move the cpt and nitrox rules into the cavium Makefile.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

+3 -3
+1 -3
drivers/crypto/Makefile
··· 8 8 obj-$(CONFIG_CRYPTO_DEV_ATMEL_I2C) += atmel-i2c.o 9 9 obj-$(CONFIG_CRYPTO_DEV_ATMEL_ECC) += atmel-ecc.o 10 10 obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA204A) += atmel-sha204a.o 11 - obj-$(CONFIG_CRYPTO_DEV_CAVIUM_ZIP) += cavium/ 12 11 obj-$(CONFIG_CRYPTO_DEV_CCP) += ccp/ 13 12 obj-$(CONFIG_CRYPTO_DEV_CCREE) += ccree/ 14 13 obj-$(CONFIG_CRYPTO_DEV_CHELSIO) += chelsio/ 15 - obj-$(CONFIG_CRYPTO_DEV_CPT) += cavium/cpt/ 16 - obj-$(CONFIG_CRYPTO_DEV_NITROX) += cavium/nitrox/ 17 14 obj-$(CONFIG_CRYPTO_DEV_EXYNOS_RNG) += exynos-rng.o 18 15 obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON) += caam/ 19 16 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o ··· 47 50 obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic/ 48 51 obj-y += intel/ 49 52 obj-y += starfive/ 53 + obj-y += cavium/
+2
drivers/crypto/cavium/Makefile
··· 2 2 # 3 3 # Makefile for Cavium crypto device drivers 4 4 # 5 + obj-$(CONFIG_CRYPTO_DEV_CPT) += cpt/ 6 + obj-$(CONFIG_CRYPTO_DEV_NITROX) += nitrox/ 5 7 obj-$(CONFIG_CRYPTO_DEV_CAVIUM_ZIP) += zip/