git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[sfrench/cifs-2.6.git]
/
arch
/
cris
/
arch-v32
/
mm
/
Makefile
diff --git
a/arch/cris/arch-v32/mm/Makefile
b/arch/cris/arch-v32/mm/Makefile
index 9146f88484b1292a3acfa4e98e9148ff7303eb83..0b801f2964ac378c50c67968d3a45b856adaf450 100644
(file)
--- a/
arch/cris/arch-v32/mm/Makefile
+++ b/
arch/cris/arch-v32/mm/Makefile
@@
-1,3
+1,4
@@
# Makefile for the Linux/cris parts of the memory manager.
-obj-y := mmu.o init.o tlb.o intmem.o
+obj-y += mmu.o init.o tlb.o intmem.o
+obj-$(CONFIG_ETRAX_L2CACHE) += l2cache.o