Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24035/arch/ppc/platforms
Modified Files:
Makefile
Log Message:
Merged 2.6.5
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile 17 Apr 2004 08:55:55 -0000 1.7
+++ Makefile 24 Apr 2004 18:31:43 -0000 1.8
@@ -41,11 +41,11 @@
obj-$(CONFIG_PAL4) += pal4_setup.o pal4_pci.o
obj-$(CONFIG_PCORE) += pcore_setup.o pcore_pci.o
obj-$(CONFIG_POWERPMC250) += powerpmc250.o
-obj-$(CONFIG_PPLUS) += pplus_pci.o pplus_setup.o
+obj-$(CONFIG_PPLUS) += pplus.o
obj-$(CONFIG_PRPMC750) += prpmc750_setup.o prpmc750_pci.o
obj-$(CONFIG_PRPMC800) += prpmc800_setup.o prpmc800_pci.o
obj-$(CONFIG_SANDPOINT) += sandpoint.o
-obj-$(CONFIG_SPRUCE) += spruce_setup.o spruce_pci.o
+obj-$(CONFIG_SPRUCE) += spruce.o
obj-$(CONFIG_GAMECUBE) += gamecube.o gamecube_pic.o gamecube_time.o
obj-$(CONFIG_GAMECUBE_CONSOLE) += console.o
obj-$(CONFIG_GAMECUBE_RESET_SWITCH) += gc-rsw.o
|
