projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[cascardo/linux.git]
/
drivers
/
soc
/
versatile
/
Makefile
diff --git
a/drivers/soc/versatile/Makefile
b/drivers/soc/versatile/Makefile
index
ad54743
..
cf612fe
100644
(file)
--- a/
drivers/soc/versatile/Makefile
+++ b/
drivers/soc/versatile/Makefile
@@
-1
+1,2
@@
+obj-$(CONFIG_SOC_INTEGRATOR_CM) += soc-integrator.o
obj-$(CONFIG_SOC_REALVIEW) += soc-realview.o