summaryrefslogtreecommitdiff
path: root/drivers/crypto/Makefile
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-06-04 19:45:31 +0800
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-06-04 19:45:31 +0800
commit1aba37fc5314da4ea3c3eb759b9e4c52c4404136 (patch)
tree2648401ad8afc092a9cefe42f8a8e5d12cb914c5 /drivers/crypto/Makefile
parent5347127d7d2ccffdd5dc6af8a24010199ef86f46 (diff)
parent7ab5ecfab5802502955e1a9789eeb8e2fc3a985f (diff)
Merge topic branch 'security' into integration-linux-ux500
Diffstat (limited to 'drivers/crypto/Makefile')
-rw-r--r--drivers/crypto/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index f3e64eadd7a..8737ed1bdfe 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -14,3 +14,4 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
+obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/