diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:46:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:46:03 -0800 |
| commit | 0eddf038adc8dff78efe86b71284e3f52b7cef27 (patch) | |
| tree | 0b1521e7117b36f315ad1c4d9a4a3175da80cfd8 /drivers | |
| parent | 86b7cbc9d3f7b357dbd4f22779c5df375eb76c46 (diff) | |
| parent | c8620c2590f43eff864fe597fcbe5b72ab7a7b94 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] null: Add missing Kconfig dependency on BLKCIPHER
[CRYPTO] tcrypt: Add missing Kconfig dependency on BLKCIPHER
[HIFN]: Fix invalid config ifdefs for RNG support
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/hifn_795x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index dfbf24c4033c..3110bf7014f7 100644 --- a/drivers/crypto/hifn_795x.c +++ b/drivers/crypto/hifn_795x.c @@ -463,7 +463,7 @@ struct hifn_device unsigned int pk_clk_freq; -#ifdef CRYPTO_DEV_HIFN_795X_RNG +#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG unsigned int rng_wait_time; ktime_t rngtime; struct hwrng rng; @@ -795,7 +795,7 @@ static struct pci2id { } }; -#ifdef CRYPTO_DEV_HIFN_795X_RNG +#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG static int hifn_rng_data_present(struct hwrng *rng, int wait) { struct hifn_device *dev = (struct hifn_device *)rng->priv; @@ -880,7 +880,7 @@ static int hifn_init_pubrng(struct hifn_device *dev) dprintk("Chip %s: RNG engine has been successfully initialised.\n", dev->name); -#ifdef CRYPTO_DEV_HIFN_795X_RNG +#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG /* First value must be discarded */ hifn_read_1(dev, HIFN_1_RNG_DATA); dev->rngtime = ktime_get(); |