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/s390/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/s390/kernel/Makefile')
-rw-r--r-- | arch/s390/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 4d3e38392cb1..ce144b67f060 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -11,7 +11,7 @@ CFLAGS_smp.o := -Wno-nonnull obj-y := bitmap.o traps.o time.o process.o base.o early.o \ setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ - semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o diag.o + s390_ext.o debug.o irq.o ipl.o dis.o diag.o obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o) obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o) |