aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-25 02:53:02 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-10-25 03:13:08 -0400
commite52278a36898dc93aa1991a3ac976c1c7c55e2ed (patch)
tree2ec22284acac5a68254165e7b621a6d2807bf2a0
parent6828b4bb7632051cdf925ad0b2f1ba3f906c5d47 (diff)
Input: remove CONFIG_EXPERIMENTAL from miscellaneous drivers
This config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/misc/Kconfig7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7c0f1ecfdd7..a7719a22d17 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -290,8 +290,7 @@ config INPUT_ATI_REMOTE2
290 called ati_remote2. 290 called ati_remote2.
291 291
292config INPUT_KEYSPAN_REMOTE 292config INPUT_KEYSPAN_REMOTE
293 tristate "Keyspan DMR USB remote control (EXPERIMENTAL)" 293 tristate "Keyspan DMR USB remote control"
294 depends on EXPERIMENTAL
295 depends on USB_ARCH_HAS_HCD 294 depends on USB_ARCH_HAS_HCD
296 select USB 295 select USB
297 help 296 help
@@ -340,7 +339,6 @@ config INPUT_POWERMATE
340 339
341config INPUT_YEALINK 340config INPUT_YEALINK
342 tristate "Yealink usb-p1k voip phone" 341 tristate "Yealink usb-p1k voip phone"
343 depends on EXPERIMENTAL
344 depends on USB_ARCH_HAS_HCD 342 depends on USB_ARCH_HAS_HCD
345 select USB 343 select USB
346 help 344 help
@@ -356,7 +354,6 @@ config INPUT_YEALINK
356 354
357config INPUT_CM109 355config INPUT_CM109
358 tristate "C-Media CM109 USB I/O Controller" 356 tristate "C-Media CM109 USB I/O Controller"
359 depends on EXPERIMENTAL
360 depends on USB_ARCH_HAS_HCD 357 depends on USB_ARCH_HAS_HCD
361 select USB 358 select USB
362 help 359 help
@@ -434,7 +431,7 @@ config INPUT_PCF50633_PMU
434 431
435config INPUT_PCF8574 432config INPUT_PCF8574
436 tristate "PCF8574 Keypad input device" 433 tristate "PCF8574 Keypad input device"
437 depends on I2C && EXPERIMENTAL 434 depends on I2C
438 help 435 help
439 Say Y here if you want to support a keypad connected via I2C 436 Say Y here if you want to support a keypad connected via I2C
440 with a PCF8574. 437 with a PCF8574.