Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268564
b: refs/heads/master
c: b414e2e
h: refs/heads/master
v: v3
  • Loading branch information
Marc Dietrich authored and Greg Kroah-Hartman committed Sep 30, 2011
1 parent b98f78d commit cce530a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 7c6b6c7110a2b51d579f791aaaf4878ebf066962
refs/heads/master: b414e2eb3a487c901c6e0c515753fc0905784eac
6 changes: 3 additions & 3 deletions trunk/drivers/staging/nvec/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ config MFD_NVEC

config KEYBOARD_NVEC
bool "Keyboard on nVidia compliant EC"
depends on MFD_NVEC
depends on MFD_NVEC && INPUT=y
help
Say Y here to enable support for a keyboard connected to
a nVidia compliant embedded controller.

config SERIO_NVEC_PS2
bool "PS2 on nVidia EC"
depends on MFD_NVEC
depends on MFD_NVEC && MOUSE_PS2
help
Say Y here to enable support for a Touchpad / Mouse connected
to a nVidia compliant embedded controller.

config NVEC_POWER
bool "NVEC charger and battery"
depends on MFD_NVEC
depends on MFD_NVEC && POWER_SUPPLY=y
help
Say Y to enable support for battery and charger interface for
nVidia compliant embedded controllers.
Expand Down

0 comments on commit cce530a

Please sign in to comment.