diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-11 13:15:18 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-11 13:15:18 +1100 |
commit | 35dac477820609e7409b486b2b6064ce44173a27 (patch) | |
tree | 07e3ccb6ade7ce6c07bfb2a757d4484e48c4c997 /arch/v850/kernel/Makefile | |
parent | a309ba636785509e22212e24797beae1119a4c4a (diff) | |
parent | 6fcc0ef3af13bcdb603250755b916e423ce4b065 (diff) |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/firewire/fw-device.c
Diffstat (limited to 'arch/v850/kernel/Makefile')
-rw-r--r-- | arch/v850/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/v850/kernel/Makefile b/arch/v850/kernel/Makefile index 3930482bddc4..da5889c53576 100644 --- a/arch/v850/kernel/Makefile +++ b/arch/v850/kernel/Makefile @@ -11,7 +11,7 @@ extra-y := head.o init_task.o vmlinux.lds -obj-y += intv.o entry.o process.o syscalls.o time.o semaphore.o setup.o \ +obj-y += intv.o entry.o process.o syscalls.o time.o setup.o \ signal.o irq.o mach.o ptrace.o bug.o obj-$(CONFIG_MODULES) += module.o v850_ksyms.o # chip-specific code |