diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 15:45:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 15:45:02 -0700 |
| commit | 58f8236bed448273cd7f9ae02c09467853303484 (patch) | |
| tree | 5fd9f04dbdda368de31fa22d0f8d8b3fb317a0b7 /arch/arm/kernel/Makefile | |
| parent | [PATCH] Remove __devinit and __cpuinit from notifier_call definitions (diff) | |
| parent | Merge nommu tree (diff) | |
| download | linux-dev-58f8236bed448273cd7f9ae02c09467853303484.tar.xz linux-dev-58f8236bed448273cd7f9ae02c09467853303484.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] nommu: trivial fixups for head-nommu.S and the Makefile
[ARM] vfp: fix leak of VFP_NAN_FLAG into FPSCR
[ARM] 3484/1: Correct AEABI CFLAGS for correct enum handling
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 2ce0e3a27a45..a601b8b55f35 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y) obj-y += io.o endif -head-y := head.o +head-y := head$(MMUEXT).o obj-$(CONFIG_DEBUG_LL) += debug.o extra-y := $(head-y) init_task.o vmlinux.lds |