diff --git a/[refs] b/[refs]
index 81457321a042..d1f7ae21a484 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c6b6c7110a2b51d579f791aaaf4878ebf066962
+refs/heads/master: b414e2eb3a487c901c6e0c515753fc0905784eac
diff --git a/trunk/drivers/staging/nvec/Kconfig b/trunk/drivers/staging/nvec/Kconfig
index a86cf27ae244..86a8b8c418c0 100644
--- a/trunk/drivers/staging/nvec/Kconfig
+++ b/trunk/drivers/staging/nvec/Kconfig
@@ -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.