[Gc-linux-cvs] linux/drivers/input Kconfig,1.9,1.10

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/input
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13650/drivers/input

Modified Files:
	Kconfig 
Log Message:
Merged 2.6.25.
Queued small fixes for: 
- starlet-es
- starlet-ipc
- starlet-stm
- rvl-stsd
- rvl-sthcd
- gcn-ai



Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/Kconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Kconfig	24 Feb 2008 18:05:32 -0000	1.9
+++ Kconfig	13 Sep 2008 19:42:54 -0000	1.10
@@ -137,6 +137,18 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called evbug.
 
+config INPUT_APMPOWER
+	tristate "Input Power Event -> APM Bridge" if EMBEDDED
+	depends on INPUT && APM_EMULATION
+	---help---
+	  Say Y here if you want suspend key events to trigger a user
+	  requested suspend through APM. This is useful on embedded
+	  systems where such behviour is desired without userspace
+	  interaction. If unsure, say N.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called apm-power.
+
 comment "Input Device Drivers"
 
 source "drivers/input/keyboard/Kconfig"