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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
mach-fs
/
Makefile
diff --git
a/arch/cris/arch-v32/mach-fs/Makefile
b/arch/cris/arch-v32/mach-fs/Makefile
index
4ff407a
..
41fa6a6
100644
(file)
--- a/
arch/cris/arch-v32/mach-fs/Makefile
+++ b/
arch/cris/arch-v32/mach-fs/Makefile
@@
-4,7
+4,7
@@
#
obj-y := dma.o pinmux.o io.o arbiter.o
-bj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
+
o
bj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
clean: