agp/hp: fixup hp agp after ACPI changes

[safe/jmp/linux-2.6] / drivers / char / hw_random / Kconfig

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index efd0b4d..8706026 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -20,6 +20,20 @@ config HW_RANDOM
 
          If unsure, say Y.
 
+config HW_RANDOM_TIMERIOMEM
+       tristate "Timer IOMEM HW Random Number Generator support"
+       depends on HW_RANDOM && HAS_IOMEM
+       ---help---
+         This driver provides kernel-side support for a generic Random
+         Number Generator used by reading a 'dumb' iomem address that
+         is to be read no faster than, for example, once a second;
+         the default FPGA bitstream on the TS-7800 has such functionality.
+
+         To compile this driver as a module, choose M here: the
+         module will be called timeriomem-rng.
+
+         If unsure, say Y.
+
 config HW_RANDOM_INTEL
        tristate "Intel HW Random Number Generator support"
        depends on HW_RANDOM && (X86 || IA64) && PCI
@@ -59,9 +73,22 @@ config HW_RANDOM_GEODE
 
          If unsure, say Y.
 
+config HW_RANDOM_N2RNG
+       tristate "Niagara2 Random Number Generator support"
+       depends on HW_RANDOM && SPARC64
+       default HW_RANDOM
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on Niagara2 cpus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called n2-rng.
+
+         If unsure, say Y.
+
 config HW_RANDOM_VIA
        tristate "VIA HW Random Number Generator support"
-       depends on HW_RANDOM && X86_32
+       depends on HW_RANDOM && X86
        default HW_RANDOM
        ---help---
          This driver provides kernel-side support for the Random Number
@@ -99,6 +126,19 @@ config HW_RANDOM_OMAP
 
          If unsure, say Y.
 
+config HW_RANDOM_OCTEON
+       tristate "Octeon Random Number Generator support"
+       depends on HW_RANDOM && CPU_CAVIUM_OCTEON
+       default HW_RANDOM
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on Octeon processors.
+
+         To compile this driver as a module, choose M here: the
+         module will be called octeon-rng.
+
+         If unsure, say Y.
+
 config HW_RANDOM_PASEMI
        tristate "PA Semi HW Random Number Generator support"
        depends on HW_RANDOM && PPC_PASEMI
@@ -121,3 +161,28 @@ 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
+       ---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.