[Gc-linux-cvs] linux/arch/ppc/platforms Makefile,1.25,1.26

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

Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4241/arch/ppc/platforms

Modified Files:
	Makefile 
Log Message:
Merge 2.6.26.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile	24 Feb 2008 18:05:31 -0000	1.25
+++ Makefile	14 Sep 2008 19:20:27 -0000	1.26
@@ -4,7 +4,6 @@
 
 obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o
 obj-$(CONFIG_PREP_RESIDUAL)	+= residual.o
-obj-$(CONFIG_PQ2ADS)		+= pq2ads.o
 obj-$(CONFIG_TQM8260)		+= tqm8260_setup.o
 obj-$(CONFIG_CPCI690)		+= cpci690.o
 obj-$(CONFIG_EV64260)		+= ev64260.o
@@ -24,9 +23,6 @@
 obj-$(CONFIG_SPRUCE)		+= spruce.o
 obj-$(CONFIG_LITE5200)		+= lite5200.o
 obj-$(CONFIG_EV64360)		+= ev64360.o
-obj-$(CONFIG_MPC86XADS)		+= mpc866ads_setup.o
-obj-$(CONFIG_MPC885ADS)		+= mpc885ads_setup.o
-obj-$(CONFIG_ADS8272)		+= mpc8272ads_setup.o
 obj-$(CONFIG_GAMECUBE)		+= gamecube.o
 obj-$(CONFIG_GAMECUBE_RTC)	+= gcn-rtc.o
 obj-$(CONFIG_GAMECUBE_CONSOLE)	+= gcn-con.o