vserver 2.0 rc7

[linux-2.6.git] / arch / parisc / kernel / Makefile

diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 6775b82..171f9c2 100644 (file)
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -2,9 +2,7 @@
 # Makefile for arch/parisc/kernel
 #
 
-head-y                 := head.o
-head-$(CONFIG_PARISC64)        := head64.o
-extra-y                        := init_task.o $(head-y) vmlinux.lds.s
+extra-y                        := init_task.o head.o vmlinux.lds
 
 AFLAGS_entry.o := -traditional
 AFLAGS_pacache.o := -traditional
@@ -14,12 +12,13 @@ obj-y               := cache.o pacache.o setup.o traps.o time.o irq.o \
                   pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \
                   ptrace.o hardware.o inventory.o drivers.o semaphore.o \
                   signal.o hpmc.o real2.o parisc_ksyms.o unaligned.o \
-                  process.o processor.o pdc_cons.o pdc_chassis.o
+                  process.o processor.o pdc_cons.o pdc_chassis.o unwind.o \
+                  topology.o
 
 obj-$(CONFIG_SMP)      += smp.o
 obj-$(CONFIG_PA11)     += pci-dma.o
 obj-$(CONFIG_PCI)      += pci.o
 obj-$(CONFIG_MODULES)  += module.o
-obj-$(CONFIG_PARISC64) += binfmt_elf32.o sys_parisc32.o ioctl32.o signal32.o
+obj-$(CONFIG_64BIT)    += binfmt_elf32.o sys_parisc32.o ioctl32.o signal32.o
 # only supported for PCX-W/U in 64-bit mode at the moment
-obj-$(CONFIG_PARISC64) += perf.o perf_asm.o
+obj-$(CONFIG_64BIT)    += perf.o perf_asm.o