linux-next: manual merge of the mips tree with the arm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi Ralf,

Today's linux-next merge of the mips tree got conflicts in
drivers/char/hw_random/Kconfig and drivers/char/hw_random/Makefile
between commit 45001e92d0249a8c4b9f6c3695215652e8e8493d ("i.MX31: Add
hw-random for RNGA") from the arm tree and commit
5f2b54f3ee4417d943b98440063a5534503f6d6d ("MIPS: hwrng: Add TX4939 RNG
driver") from the mips tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/char/hw_random/Kconfig
index 26c93c7,9d321cc..0000000
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -149,14 -149,15 +149,27 @@@ config HW_RANDOM_VIRTI
  	  To compile this driver as a module, choose M here: the
  	  module will be called virtio-rng.  If unsure, say N.
  
 +config HW_RANDOM_MXC_RNGA
 +	tristate "Freescale i.MX RNGA Random Number Generator"
 +	depends on HW_RANDOM && ARCH_HAS_RNGA
 +	---help---
 +	  This driver provides kernel-side support for the Random Number
 +	  Generator hardware found on Freescale i.MX processors.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called mxc-rnga.
 +
 +	  If unsure, say Y.
++
+ config HW_RANDOM_TX4939
+ 	tristate "TX4939 Random Number Generator support"
+ 	depends on HW_RANDOM && SOC_TX4939
+ 	default HW_RANDOM
+ 	---help---
+ 	  This driver provides kernel-side support for the Random Number
+ 	  Generator hardware found on TX4939 SoC.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called tx4939-rng.
+ 
+ 	  If unsure, say Y.
diff --cc drivers/char/hw_random/Makefile
index fd1ecd2,936d388..0000000
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@@ -15,4 -15,4 +15,5 @@@ obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4x
  obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
  obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
  obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
 +obj-$(CONFIG_HW_RANDOM_MXC_RNGA) += mxc-rnga.o
+ obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o