diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-08-11 15:06:23 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 15:06:23 +0200 |
| commit | 663d3f7c2e5e1b018a4c53277ccfde40329d98ca (patch) | |
| tree | a3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a /drivers/of/Makefile | |
| parent | Merge branch 'devicetree/next-console' into devicetree/next (diff) | |
| parent | of: typo fix in __of_prop_dup() (diff) | |
| download | linux-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.tar.xz linux-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.zip | |
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/Makefile | 1 |
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 |