Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346923
b: refs/heads/master
c: e52278a
h: refs/heads/master
i:
  346921: 0e226f1
  346919: 41b1790
v: v3
  • Loading branch information
Kees Cook authored and Dmitry Torokhov committed Oct 25, 2012
1 parent 0f8af68 commit c1995cf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6828b4bb7632051cdf925ad0b2f1ba3f906c5d47
refs/heads/master: e52278a36898dc93aa1991a3ac976c1c7c55e2ed
7 changes: 2 additions & 5 deletions trunk/drivers/input/misc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,7 @@ config INPUT_ATI_REMOTE2
called ati_remote2.

config INPUT_KEYSPAN_REMOTE
tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Keyspan DMR USB remote control"
depends on USB_ARCH_HAS_HCD
select USB
help
Expand Down Expand Up @@ -340,7 +339,6 @@ config INPUT_POWERMATE

config INPUT_YEALINK
tristate "Yealink usb-p1k voip phone"
depends on EXPERIMENTAL
depends on USB_ARCH_HAS_HCD
select USB
help
Expand All @@ -356,7 +354,6 @@ config INPUT_YEALINK

config INPUT_CM109
tristate "C-Media CM109 USB I/O Controller"
depends on EXPERIMENTAL
depends on USB_ARCH_HAS_HCD
select USB
help
Expand Down Expand Up @@ -434,7 +431,7 @@ config INPUT_PCF50633_PMU

config INPUT_PCF8574
tristate "PCF8574 Keypad input device"
depends on I2C && EXPERIMENTAL
depends on I2C
help
Say Y here if you want to support a keypad connected via I2C
with a PCF8574.
Expand Down

0 comments on commit c1995cf

Please sign in to comment.