summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2016-01-20 11:08:56 +0100
committerShawn Guo <shawnguo@kernel.org>2016-02-29 16:17:39 +0800
commit89435feaaa7a4c9fdad45a888495a96561db3c08 (patch)
treeb5fcc650d361959adaec9eb067426fa33ec28e2a /arch/arm/boot
parent302e01b266c56e3faac2e19fe5fb8e43abf5bb94 (diff)
downloadtalos-obmc-linux-89435feaaa7a4c9fdad45a888495a96561db3c08.tar.gz
talos-obmc-linux-89435feaaa7a4c9fdad45a888495a96561db3c08.zip
ARM: dts: imx6ul: move dt-bindings/input/input.h include to dtsi file
imx6ul.dtsi references the macro 'KEY_POWER' from dt-bindings/input/input.h. Thus, move the include statement for this file from imx6ul-14x14-evk.dts to imx6ul.dtsi itself. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6ul-14x14-evk.dts1
-rw-r--r--arch/arm/boot/dts/imx6ul.dtsi1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index e06fe978ae3b..720728001d3c 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -8,7 +8,6 @@
/dts-v1/;
-#include <dt-bindings/input/input.h>
#include "imx6ul.dtsi"
/ {
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 7e27d76a2d5d..e4c3a80e366c 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -8,6 +8,7 @@
#include <dt-bindings/clock/imx6ul-clock.h>
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "imx6ul-pinfunc.h"
#include "skeleton.dtsi"
OpenPOWER on IntegriCloud