Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

[linux-2.6.git] / arch / ppc / boot / simple / Makefile

diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index d497a93..2bae1ea 100644 (file)
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -65,7 +65,7 @@ zimageinitrd-$(CONFIG_OCOTEA)         := zImage.initrd-TREE
          end-$(CONFIG_OCOTEA)          := ocotea
   entrypoint-$(CONFIG_OCOTEA)          := 0x01000000
 
-     extra.o-$(CONFIG_EV64260)         := direct.o misc-ev64260.o
+     extra.o-$(CONFIG_EV64260)         := misc-ev64260.o
          end-$(CONFIG_EV64260)         := ev64260
    cacheflag-$(CONFIG_EV64260)         := -include $(clear_L2_L3)
 
@@ -136,14 +136,16 @@ boot-$(CONFIG_8xx)                += embed_config.o
 boot-$(CONFIG_8260)            += embed_config.o
 boot-$(CONFIG_BSEIP)           += iic.o
 boot-$(CONFIG_MBX)             += iic.o pci.o qspan_pci.o
+boot-$(CONFIG_MV64X60)         += misc-mv64x60.o
+boot-$(CONFIG_DMV182)          += mv64x60_stub.o
 boot-$(CONFIG_RPXCLASSIC)      += iic.o pci.o qspan_pci.o
 boot-$(CONFIG_RPXLITE)         += iic.o
 # Different boards need different serial implementations.
 ifeq ($(CONFIG_SERIAL_CONSOLE),y)
 boot-$(CONFIG_8xx)             += m8xx_tty.o
 boot-$(CONFIG_8260)            += m8260_tty.o
-boot-$(CONFIG_GT64260_CONSOLE) += gt64260_tty.o
 endif
+boot-$(CONFIG_SERIAL_MPSC_CONSOLE)     += mv64x60_tty.o
 
 LIBS                           := $(common)/lib.a $(bootlib)/lib.a
 ifeq ($(CONFIG_PPC_PREP),y)