[Gc-linux-cvs] linux/drivers/input Kconfig,1.17,1.18

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

Update of /cvsroot/gc-linux/linux/drivers/input
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/input

Modified Files:
	Kconfig 
Log Message:
Merge v2.6.32.

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/Kconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Kconfig	9 Dec 2009 18:18:07 -0000	1.17
--- Kconfig	9 Dec 2009 18:44:55 -0000	1.18
***************
*** 181,184 ****
--- 181,186 ----
  source "drivers/input/gameport/Kconfig"
  
+ source "drivers/input/si/Kconfig"
+ 
  endmenu