On Mon, 21 Aug 2006 09:04:15 +1000 Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote: > > --- linux-2.6.18-rc4-mm2/drivers/crypto/Kconfig.old 2006-08-20 17:28:46.000000000 +0200 > > +++ linux-2.6.18-rc4-mm2/drivers/crypto/Kconfig 2006-08-20 17:44:56.000000000 +0200 > > @@ -16,6 +16,7 @@ > > config CRYPTO_DEV_PADLOCK_AES > > bool "Support for AES in VIA PadLock" > > depends on CRYPTO_DEV_PADLOCK > > + select CRYPTO_BLKCIPHER > > default y > > help > > Use VIA PadLock for AES algorithm. > > Andrew, there is definitely something screwed up. Things are a bit messy at present - some git trees are based off Greg's tree and some are based off Linus's and git is pretty hopeless at pulling usable diffs in these complex situations. So yes, it's quite possible that the above is a merging problem. - To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
