Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / char / hw_random / Kconfig

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index f4b3f7293feb92b69d13a8c60531522d37335712..ce66a70184f7568d8023ca0b5243ae9d7053eb75 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -149,6 +149,19 @@ config HW_RANDOM_VIRTIO
          To compile this driver as a module, choose M here: the
          module will be called virtio-rng.  If unsure, say N.
 
+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.
+
 config HW_RANDOM_MXC_RNGA
        tristate "Freescale i.MX RNGA Random Number Generator"
        depends on HW_RANDOM && ARCH_HAS_RNGA