o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 3561fd26a..6f1060560 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -15,7 +15,7 @@ OX_OBJS := ppc_ksyms.o
 
 
 O_OBJS := traps.o irq.o idle.o time.o process.o signal.o syscalls.o misc.o \
-	  bitops.o ppc_htab.o setup.o ptrace.o align.o
+	  bitops.o setup.o ptrace.o align.o ppc_htab.o
 
 ifdef CONFIG_PCI
 O_OBJS += pci.o
@@ -28,12 +28,13 @@ ifeq ($(CONFIG_MBX),y)
 O_OBJS += mbx_setup.o mbx_pci.o softemu8xx.o
 else
 ifeq ($(CONFIG_APUS),y)
-O_OBJS += prom.o openpic.o
+O_OBJS += apus_setup.o prom.o openpic.o
 else
 O_OBJS += prep_time.o pmac_time.o chrp_time.o \
-	  prep_setup.o pmac_setup.o pmac_support.o chrp_setup.o \
+	  pmac_setup.o pmac_support.o chrp_setup.o \
 	  prep_pci.o pmac_pci.o chrp_pci.o \
 	  residual.o prom.o openpic.o
+OX_OBJS += prep_setup.o
 endif
 endif