[Gc-linux-cvs] linux/drivers/misc Makefile,1.2,1.3

[<aot...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25722/drivers/misc

Modified Files:
	Makefile 
Log Message:
Merge 2.6.12


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	7 Jan 2005 23:40:14 -0000	1.2
+++ Makefile	23 Jun 2005 20:02:18 -0000	1.3
@@ -4,5 +4,6 @@
 obj- := misc.o	# Dummy rule to force built-in.o to be made
 
 obj-$(CONFIG_IBM_ASM)	+= ibmasm/
+obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/
 obj-$(CONFIG_GAMECUBE_GQR)	+= gcn-gqr.o
 obj-$(CONFIG_GAMECUBE_MI)	+= gcn-mi.o