projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
drivers
/
soc
/
Makefile
diff --git
a/drivers/soc/Makefile
b/drivers/soc/Makefile
index 36dec140ea0ded1ff76234d7c53e1da6ab0c8060..deecb16e7256d08eadb6f697afcbc1465ab65716 100644
(file)
--- a/
drivers/soc/Makefile
+++ b/
drivers/soc/Makefile
@@
-11,7
+11,7
@@
obj-$(CONFIG_MACH_DOVE) += dove/
obj-y += fsl/
obj-$(CONFIG_ARCH_MXC) += imx/
obj-$(CONFIG_SOC_XWAY) += lantiq/
-obj-
$(CONFIG_ARCH_MEDIATEK)
+= mediatek/
+obj-
y
+= mediatek/
obj-$(CONFIG_ARCH_MESON) += amlogic/
obj-$(CONFIG_ARCH_QCOM) += qcom/
obj-y += renesas/