2012-05-08 07:22:10

by Stephen Rothwell

[permalink] [raw]

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

---

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
necessary.
--
Cheers,
Stephen Rothwell [email protected]

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

config HW_RANDOM_ATMEL
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)
---help---
This driver provides kernel-side support for the Random Number
Generator hardware found on Atmel AT91 devices.

---

Attachments:

(No filename) (1.00 kB)
(No filename) (836.00 B)
Download all attachments

2012-05-08 10:01:16

by Herbert Xu

[permalink] [raw]

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

---

On Tue, May 08, 2012 at 05:21:53PM +1000, Stephen Rothwell wrote:
> 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
> necessary.

Looks good. Thanks Stephen!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt