diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-09-09 17:34:41 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-09-09 17:34:41 +0200 |
commit | e558bdc21ae1f0db520eccd84015e17d8a589973 (patch) | |
tree | b436123bd52f267b8c7f361618cded3e1e4421ea /arch/arm/boot/dts/imx6q-zii-rdu2.dts | |
parent | ARM: 8692/1: mm: abort uaccess retries upon fatal signal (diff) | |
parent | ARM: 8691/1: Export save_stack_trace_tsk() (diff) | |
download | linux-e558bdc21ae1f0db520eccd84015e17d8a589973.tar.xz linux-e558bdc21ae1f0db520eccd84015e17d8a589973.zip |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/boot/dts/imx6q-zii-rdu2.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts index b2d346640fd7..6be8a1eea895 100644 --- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts +++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts @@ -41,8 +41,8 @@ /dts-v1/; -#include <imx6q.dtsi> -#include <imx6qdl-zii-rdu2.dtsi> +#include "imx6q.dtsi" +#include "imx6qdl-zii-rdu2.dtsi" / { model = "ZII RDU2 Board"; |