git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into perf/urgent
[pandora-kernel.git]
/
arch
/
microblaze
/
kernel
/
Makefile
diff --git
a/arch/microblaze/kernel/Makefile
b/arch/microblaze/kernel/Makefile
index
5eecc9f
..
f0cb5c2
100644
(file)
--- a/
arch/microblaze/kernel/Makefile
+++ b/
arch/microblaze/kernel/Makefile
@@
-15,8
+15,8
@@
endif
extra-y := head.o vmlinux.lds
obj-y += dma.o exceptions.o \
extra-y := head.o vmlinux.lds
obj-y += dma.o exceptions.o \
- hw_exception_handler.o init_task.o intc.o irq.o
of_device.o
\
-
of_platform.o
process.o prom.o prom_parse.o ptrace.o \
+ hw_exception_handler.o init_task.o intc.o irq.o \
+ process.o prom.o prom_parse.o ptrace.o \
reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
obj-y += cpu/
reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
obj-y += cpu/