Merge branch 'linus' into perf/urgent

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 1421997..fa3243d 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -522,10 +522,16 @@ config HPET_MMAP
          If you say Y here, user applications will be able to mmap
          the HPET registers.
 
+config HPET_MMAP_DEFAULT
+       bool "Enable HPET MMAP access by default"
+       default y
+       depends on HPET_MMAP
+       help
          In some hardware implementations, the page containing HPET
          registers may also contain other things that shouldn't be
-         exposed to the user.  If this applies to your hardware,
-         say N here.
+         exposed to the user.  This option selects the default (if
+         kernel parameter hpet_mmap is not set) user access to the
+         registers for applications that require it.
 
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"