diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-08-11 09:06:23 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 09:06:23 -0400 |
| commit | 663d3f7c2e5e1b018a4c53277ccfde40329d98ca (patch) | |
| tree | a3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a /drivers/of/testcase-data | |
| parent | b775e642bf958a02210ac4d4edd1a1b7067c49fa (diff) | |
| parent | b6ae5dc54b0a5c542d06d46b9083ceb70bf7e083 (diff) | |
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 @@ | |||
| 1 | /dts-v1/; | 1 | /dts-v1/; |
| 2 | / { | ||
| 3 | testcase-data { | ||
| 4 | changeset { | ||
| 5 | prop-update = "hello"; | ||
| 6 | prop-remove = "world"; | ||
| 7 | node-remove { | ||
| 8 | }; | ||
| 9 | }; | ||
| 10 | }; | ||
| 11 | }; | ||
| 2 | #include "tests-phandle.dtsi" | 12 | #include "tests-phandle.dtsi" |
| 3 | #include "tests-interrupts.dtsi" | 13 | #include "tests-interrupts.dtsi" |
| 4 | #include "tests-match.dtsi" | 14 | #include "tests-match.dtsi" |