Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / drivers / char / hw_random / Kconfig

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index ff00331..67ee8b0 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -77,7 +77,7 @@ config HW_RANDOM_ATMEL
 
 config HW_RANDOM_BCM63XX
        tristate "Broadcom BCM63xx Random Number Generator support"
-       depends on BCM63XX
+       depends on BCM63XX || BMIPS_GENERIC
        default HW_RANDOM
        ---help---
          This driver provides kernel-side support for the Random Number
@@ -382,6 +382,19 @@ config HW_RANDOM_STM32
 
          If unsure, say N.
 
+config HW_RANDOM_PIC32
+       tristate "Microchip PIC32 Random Number Generator support"
+       depends on HW_RANDOM && MACH_PIC32
+       default y
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on a PIC32.
+
+         To compile this driver as a module, choose M here. the
+         module will be called pic32-rng.
+
+         If unsure, say Y.
+
 endif # HW_RANDOM
 
 config UML_RANDOM