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 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
mips
/
cavium-octeon
/
executive
/
Makefile
diff --git
a/arch/mips/cavium-octeon/executive/Makefile
b/arch/mips/cavium-octeon/executive/Makefile
index
2fd66db
..
7f41c5b
100644
(file)
--- a/
arch/mips/cavium-octeon/executive/Makefile
+++ b/
arch/mips/cavium-octeon/executive/Makefile
@@
-11,4
+11,4
@@
obj-y += cvmx-bootmem.o cvmx-l2c.o cvmx-sysinfo.o octeon-model.o
-obj-$(CONFIG_
PCI
) += cvmx-helper-errata.o cvmx-helper-jtag.o
+obj-$(CONFIG_
CAVIUM_OCTEON_HELPER
) += cvmx-helper-errata.o cvmx-helper-jtag.o