Merge branch 'dt/property-move' into dt/next

CamonZ · Jul 5, 2017 · a4485b5 · a4485b5
2 parents 5e1743c + b8ba92b
commit a4485b5
Show file tree

Hide file tree

Showing 5 changed files with 850 additions and 744 deletions.
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
@@ -1,4 +1,4 @@
-obj-y = base.o device.o platform.o
+obj-y = base.o device.o platform.o property.o
 obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
 obj-$(CONFIG_OF_FLATTREE) += fdt.o
 obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o