[Gc-linux-cvs] linux/drivers Makefile,1.16,1.17

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

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

Modified Files:
	Makefile 
Log Message:
Merged 2.6.18.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	21 Jun 2006 18:56:05 -0000	1.16
+++ Makefile	17 Feb 2007 23:43:40 -0000	1.17
@@ -74,5 +74,9 @@
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
-obj-$(CONFIG_GAMECUBE_SI)	+= input/si/
+obj-$(CONFIG_GENERIC_TIME)	+= clocksource/
+obj-$(CONFIG_DMA_ENGINE)	+= dma/
+
 obj-$(CONFIG_GAMECUBE_EXI)	+= exi/
+obj-$(CONFIG_GAMECUBE_SI)	+= input/si/
+