projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge-fixes' into devel
[linux-2.6-block.git]
/
arch
/
arm
/
kernel
/
Makefile
diff --git
a/arch/arm/kernel/Makefile
b/arch/arm/kernel/Makefile
index d5be3f7ac0e3b504c97ba9c7e0f1a1c000b78fe9..ad455ff5aebe5379841cede6d11ae29c504b8841 100644
(file)
--- a/
arch/arm/kernel/Makefile
+++ b/
arch/arm/kernel/Makefile
@@
-7,7
+7,7
@@
AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
# Object file lists.
obj-y := compat.o entry-armv.o entry-common.o irq.o \
- process.o ptrace.o se
maphore.o se
tup.o signal.o \
+ process.o ptrace.o setup.o signal.o \
sys_arm.o stacktrace.o time.o traps.o
obj-$(CONFIG_ISA_DMA_API) += dma.o