diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/arm/kernel/Makefile | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 5bcc22af1..557aa6fc5 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -9,8 +9,8 @@ HEAD_OBJ = head-$(PROCESSOR).o ENTRY_OBJ = entry-$(PROCESSOR).o O_TARGET := kernel.o -O_OBJS := $(ENTRY_OBJ) irq.o process.o ptrace.o setup.o \ - signal.o sys_arm.o time.o traps.o +O_OBJS := $(ENTRY_OBJ) ioport.o irq.o process.o ptrace.o \ + semaphore.o setup.o signal.o sys_arm.o time.o traps.o ifeq ($(CONFIG_ISA_DMA),y) ISA_DMA_OBJS += dma-isa.o @@ -20,7 +20,7 @@ O_OBJS_arc = dma-arc.o iic.o fiq.o oldlatches.o O_OBJS_a5k = dma-a5k.o iic.o fiq.o O_OBJS_rpc = dma-rpc.o iic.o fiq.o O_OBJS_ebsa110 = dma-dummy.o -O_OBJS_footbridge = dma-footbridge.o $(ISA_DMA_OBJS) +O_OBJS_footbridge = dma-footbridge.o $(ISA_DMA_OBJS) isa.o O_OBJS_nexuspci = dma-dummy.o OX_OBJS_arc = dma.o @@ -30,7 +30,7 @@ OX_OBJS_ebsa110 = OX_OBJS_footbridge= dma.o hw-footbridge.o OX_OBJS_nexuspci = -all: lib kernel.o $(HEAD_OBJ) init_task.o +all: kernel.o $(HEAD_OBJ) init_task.o O_OBJS += $(O_OBJS_$(MACHINE)) @@ -48,7 +48,7 @@ ifeq ($(MACHINE),nexuspci) endif else ifdef CONFIG_PCI - O_OBJS += dec21285.o + O_OBJS += bios32.o dec21285.o endif endif @@ -80,11 +80,6 @@ include $(TOPDIR)/Rules.make $(ENTRY_OBJ): ../lib/constants.h -.PHONY: lib - -lib: - $(MAKE) -C ../lib constants.h - # Spell out some dependencies that `make dep' doesn't spot entry-armv.o: calls.S entry-armo.o: calls.S |