From 5b0cdc562e98a777f0cc30e38b8b2e6734d457f7 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Wed, 13 Jun 2012 13:22:42 -0500 Subject: [PATCH] --- yaml --- r: 318346 b: refs/heads/master c: 95ead5d7ff824a01cb07921c9211a7e29437a929 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Makefile | 1 - trunk/drivers/crypto/Makefile | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f52e2543b7cc..c235266ce83b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3621189064301a5fbb5d06ca17d966a026f4e501 +refs/heads/master: 95ead5d7ff824a01cb07921c9211a7e29437a929 diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile index 950d1f7a5a39..159e94f4b22a 100644 --- a/trunk/arch/powerpc/Makefile +++ b/trunk/arch/powerpc/Makefile @@ -149,7 +149,6 @@ core-$(CONFIG_KVM) += arch/powerpc/kvm/ core-$(CONFIG_PERF_EVENTS) += arch/powerpc/perf/ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ -drivers-$(CONFIG_CRYPTO_DEV_NX) += drivers/crypto/nx/ # Default to zImage, override when needed all: zImage diff --git a/trunk/drivers/crypto/Makefile b/trunk/drivers/crypto/Makefile index d5062bb7a1f2..1c5a145cc268 100644 --- a/trunk/drivers/crypto/Makefile +++ b/trunk/drivers/crypto/Makefile @@ -16,3 +16,4 @@ obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/ obj-$(CONFIG_CRYPTO_DEV_BFIN_CRC) += bfin_crc.o +obj-$(CONFIG_CRYPTO_DEV_NX) += nx/