Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 288909
b: refs/heads/master
c: e96045a
h: refs/heads/master
i:
  288907: cf7f952
v: v3
  • Loading branch information
Julian Andres Klode authored and Greg Kroah-Hartman committed Jan 31, 2012
1 parent 5a2d460 commit 9d0314f
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: aed92bbcf4ce760c4d7848013a0db3bdd4ae9492
refs/heads/master: e96045a7c837200e65c9fa8f8a94020bc2107931
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 && INPUT=y
depends on MFD_NVEC && INPUT
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 && MOUSE_PS2
depends on MFD_NVEC && SERIO
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 && POWER_SUPPLY=y
depends on MFD_NVEC && POWER_SUPPLY
help
Say Y to enable support for battery and charger interface for
nVidia compliant embedded controllers.
Expand Down

0 comments on commit 9d0314f

Please sign in to comment.