summaryrefslogtreecommitdiff
path: root/drivers/of/Makefile
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2014-08-11 14:06:23 +0100
committerGrant Likely <grant.likely@linaro.org>2014-08-11 14:06:23 +0100
commit663d3f7c2e5e1b018a4c53277ccfde40329d98ca (patch)
treea3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a /drivers/of/Makefile
parentb775e642bf958a02210ac4d4edd1a1b7067c49fa (diff)
parentb6ae5dc54b0a5c542d06d46b9083ceb70bf7e083 (diff)
Merge branch 'devicetree/next-overlay' into devicetree/next
Conflicts: drivers/of/testcase-data/testcases.dts
Diffstat (limited to 'drivers/of/Makefile')
-rw-r--r--drivers/of/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index b9e753b56964..2b6a7b129d10 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -1,4 +1,5 @@
obj-y = base.o device.o platform.o
+obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
obj-$(CONFIG_OF_FLATTREE) += fdt.o
obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o
obj-$(CONFIG_OF_PROMTREE) += pdt.o