diff options
| author |   Grant Likely <grant.likely@linaro.org> | 2014-08-11 14:06:23 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 14:06:23 +0100 |
| commit | 663d3f7c2e5e1b018a4c53277ccfde40329d98ca (patch) | |
| tree | a3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a /drivers/of/testcase-data | |
| parent | Merge branch 'devicetree/next-console' into devicetree/next (diff) | |
| parent | of: typo fix in __of_prop_dup() (diff) | |
| download | linux-dev-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.tar.xz linux-dev-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.zip | |
Merge branch 'devicetree/next-overlay' into devicetree/next
Conflicts:
drivers/of/testcase-data/testcases.dts
Diffstat (limited to 'drivers/of/testcase-data')
| -rw-r--r-- | drivers/of/testcase-data/testcases.dts | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/of/testcase-data/testcases.dts b/drivers/of/testcase-data/testcases.dts index 8e7568ee3175..219ef9324e9c 100644 --- a/drivers/of/testcase-data/testcases.dts +++ b/drivers/of/testcase-data/testcases.dts @@ -1,4 +1,14 @@ /dts-v1/; +/ { + testcase-data { + changeset { + prop-update = "hello"; + prop-remove = "world"; + node-remove { + }; + }; + }; +}; #include "tests-phandle.dtsi" #include "tests-interrupts.dtsi" #include "tests-match.dtsi" |