[Gc-linux-cvs] linux/drivers Kconfig,1.11,1.12 Makefile,1.36,1.37

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

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

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

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Makefile	9 Dec 2009 18:40:09 -0000	1.36
--- Makefile	9 Dec 2009 18:44:54 -0000	1.37
***************
*** 105,108 ****
--- 105,110 ----
  obj-$(CONFIG_HID)		+= hid/
  obj-$(CONFIG_PPC_PS3)		+= ps3/
+ obj-$(CONFIG_GAMECUBE_EXI)	+= exi/
+ obj-$(CONFIG_GAMECUBE_SI)	+= input/si/
  obj-$(CONFIG_OF)		+= of/
  obj-$(CONFIG_SSB)		+= ssb/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	9 Dec 2009 18:18:06 -0000	1.11
--- Kconfig	9 Dec 2009 18:44:54 -0000	1.12
***************
*** 51,54 ****
--- 51,56 ----
  source "drivers/i2c/Kconfig"
  
+ source "drivers/exi/Kconfig"
+ 
  source "drivers/spi/Kconfig"