Update of /cvsroot/gc-linux/linux/drivers
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers
Modified Files:
Kconfig Makefile
Log Message:
Merge gc-linux-v2.6.31.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Makefile 25 Oct 2009 18:56:56 -0000 1.33
--- Makefile 25 Oct 2009 18:59:27 -0000 1.34
***************
*** 104,107 ****
--- 104,109 ----
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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Kconfig 25 Oct 2009 18:56:56 -0000 1.9
--- Kconfig 25 Oct 2009 18:59:27 -0000 1.10
***************
*** 51,54 ****
--- 51,56 ----
source "drivers/i2c/Kconfig"
+ source "drivers/exi/Kconfig"
+
source "drivers/spi/Kconfig"
|