diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /drivers/crypto/Makefile | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'drivers/crypto/Makefile')
| -rw-r--r-- | drivers/crypto/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 45426ca19a23..4c3d0ec1cf80 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | |||
| 2 | obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o | 1 | obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o |
| 3 | 2 | obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o | |
| 4 | padlock-objs-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o | 3 | obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o |
| 5 | |||
| 6 | padlock-objs := padlock-generic.o $(padlock-objs-y) | ||
| 7 | |||