summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts/exynos5.dtsi
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-30 09:24:42 -0500
committerTom Rini <trini@ti.com>2015-01-30 09:24:42 -0500
commit8e3da9dd113699eed2fa05fcde3c55a2ff410913 (patch)
tree4eb27bc3dc9f86e05dcd9f77eca18d0f061ee0a9 /arch/arm/dts/exynos5.dtsi
parent0f274f5376f02ccf30327bf3e5c88d26d3ea8827 (diff)
parent85df958ce267c602a4ec5f1e41f336c5a8d3b441 (diff)
downloadtalos-obmc-uboot-8e3da9dd113699eed2fa05fcde3c55a2ff410913.tar.gz
talos-obmc-uboot-8e3da9dd113699eed2fa05fcde3c55a2ff410913.zip
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/dts/exynos5.dtsi')
-rw-r--r--arch/arm/dts/exynos5.dtsi4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/dts/exynos5.dtsi b/arch/arm/dts/exynos5.dtsi
index e53906892c..238acb80a2 100644
--- a/arch/arm/dts/exynos5.dtsi
+++ b/arch/arm/dts/exynos5.dtsi
@@ -6,6 +6,7 @@
*/
#include "skeleton.dtsi"
+#include <dt-bindings/gpio/gpio.h>
/ {
compatible = "samsung,exynos5";
@@ -247,7 +248,4 @@
u-boot,dm-pre-reloc;
id = <3>;
};
-
- gpio: gpio {
- };
};
OpenPOWER on IntegriCloud