linux-next: manual merge of the arm-soc tree with the crypto tree

From: Stephen Rothwell
Date: Tue May 08 2012 - 03:22:06 EST

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/char/hw_random/Kconfig between commit 028fdd87b79a ("hwrng:
Kconfig - modify default state for atmel-rng driver") from the crypto
tree and commit 1234f4bada54 ("hwrng: Kconfig: remove dependency for
atmel-rng driver") from the arm-soc tree.

Juts context changes. I fixed it up (see below) and can carry the fix as
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/char/hw_random/Kconfig
index 8cd64f1,b2402eb..0000000
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -62,8 -62,8 +62,8 @@@ config HW_RANDOM_AM

tristate "Atmel Random Number Generator support"
- depends on HW_RANDOM && ARCH_AT91SAM9G45
+ depends on HW_RANDOM && HAVE_CLK
- default HW_RANDOM
+ default (HW_RANDOM && ARCH_AT91)
This driver provides kernel-side support for the Random Number
Generator hardware found on Atmel AT91 devices.

Attachment: pgp00000.pgp
Description: PGP signature