summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/Makefile
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-05-11 21:03:13 +0200
committerWim Van Sebroeck <wim@iguana.be>2007-05-11 21:03:13 +0200
commit5c34202b8bf942da411b6599668a76b07449bbfd (patch)
tree5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/crypto/Makefile
parent[WATCHDOG] iTCO_wdt.c - fix ACPI Base register (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff)
downloadlinux-5c34202b8bf942da411b6599668a76b07449bbfd.tar.xz
linux-5c34202b8bf942da411b6599668a76b07449bbfd.zip
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/crypto/Makefile')
-rw-r--r--drivers/crypto/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 6059cf869414..d070030f7d7e 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o
obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o