]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge git://oak/home/sfr/kernels/iseries/work/
authorPaul Mackerras <paulus@samba.org>
Fri, 28 Oct 2005 03:50:39 +0000 (13:50 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 28 Oct 2005 03:50:39 +0000 (13:50 +1000)
1  2 
arch/powerpc/kernel/Makefile

index 8421f1975dadb3d8bb1828891751dc654041c21c,0118e516b01fff0098c659954302520a0e0a1dae..572d4f5eaacb48da8209fe169306f5b967cf3bd0
@@@ -13,7 -13,7 +13,7 @@@ endi
  obj-y                         := semaphore.o cputable.o ptrace.o syscalls.o \
                                   signal_32.o pmc.o
  obj-$(CONFIG_PPC64)           += setup_64.o binfmt_elf32.o sys_ppc32.o \
-                                  ptrace32.o
+                                  ptrace32.o systbl.o
  obj-$(CONFIG_ALTIVEC)         += vecemu.o vector.o
  obj-$(CONFIG_POWER4)          += idle_power4.o
  obj-$(CONFIG_PPC_OF)          += of_device.o
@@@ -28,17 -28,16 +28,16 @@@ extra-$(CONFIG_40x)                := head_4xx.
  extra-$(CONFIG_44x)           := head_44x.o
  extra-$(CONFIG_FSL_BOOKE)     := head_fsl_booke.o
  extra-$(CONFIG_8xx)           := head_8xx.o
- extra-$(CONFIG_PPC64)         += entry_64.o
  extra-y                               += vmlinux.lds
  
  obj-y                         += process.o init_task.o time.o \
-                                  prom.o systbl.o traps.o setup-common.o
- obj-$(CONFIG_PPC32)           += entry_32.o setup_32.o misc_32.o
+                                  prom.o traps.o setup-common.o
 -obj-$(CONFIG_PPC32)           += entry_32.o idle_6xx.o setup_32.o misc_32.o \
 -                                 systbl.o
++obj-$(CONFIG_PPC32)           += entry_32.o setup_32.o misc_32.o systbl.o
  obj-$(CONFIG_PPC64)           += misc_64.o
  obj-$(CONFIG_PPC_OF)          += prom_init.o
  obj-$(CONFIG_MODULES)         += ppc_ksyms.o
  obj-$(CONFIG_BOOTX_TEXT)      += btext.o
 +obj-$(CONFIG_6xx)             += idle_6xx.o
  
  ifeq ($(CONFIG_PPC_ISERIES),y)
  $(obj)/head_64.o: $(obj)/lparmap.s
@@@ -54,3 -53,4 +53,4 @@@ obj-$(CONFIG_PPC64)           += traps.o process
  endif
  
  extra-$(CONFIG_PPC_FPU)               += fpu.o
+ extra-$(CONFIG_PPC64)         += entry_64.o