Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index a6dfc74557339c46e13d6cac040443c63ccec68d..41b42587f5e96e330df17404623cef2a74246554 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -50,6 +50,16 @@ config INPUT_WISTRON_BTNS
          To compile this driver as a module, choose M here: the module will
          be called wistron_btns.
 
+config INPUT_ATLAS_BTNS
+       tristate "x86 Atlas button interface"
+       depends on X86 && ACPI
+       help
+         Say Y here for support of Atlas wallmount touchscreen buttons.
+         The events will show up as scancodes F1 through F9 via evdev.
+
+         To compile this driver as a module, choose M here: the module will
+         be called atlas_btns.
+
 config INPUT_IXP4XX_BEEPER
        tristate "IXP4XX Beeper support"
        depends on ARCH_IXP4XX
@@ -73,7 +83,7 @@ config INPUT_UINPUT
 
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"       
-       depends on GSC
+       depends on GSC || HP300
        select HP_SDC
        help
          Say Y here if you want to support the built-in real time clock