Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[mv-sheeva.git] / arch / um / Kconfig.char

diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char
index 62d87b71179b5b63497d6183c6b2f3c66c994fc1..e03e40c7aac35472e5139152a2158b0285c76bd8 100644 (file)
--- a/arch/um/Kconfig.char
+++ b/arch/um/Kconfig.char
@@ -190,6 +190,11 @@ config HOSTAUDIO
        tristate
        default UML_SOUND
 
+#It is selected elsewhere, so kconfig would warn without this.
+config HW_RANDOM
+       tristate
+       default n
+
 config UML_RANDOM
        tristate "Hardware random number generator"
        help