summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-29 09:02:05 -0800
committerOlof Johansson <olof@lixom.net>2013-01-29 09:02:47 -0800
commit51063a4ed955f82f408fc33cd9cc758e65a88808 (patch)
treebf06c1e6a484306052ec20e6a4a80cc57ce6a8c4 /arch/arm/boot/dts/r8a7740-armadillo800eva.dts
parent95e0d11f2dba54c1b0066e414d2b88a95908da9e (diff)
parent42dd581bc4dba82e8756bb881fa974742250b4c6 (diff)
downloadlinux-51063a4ed955f82f408fc33cd9cc758e65a88808.tar.bz2
Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman, updates to a few shmobile boards. * 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Include sh73a0 DTSI in kzm9g ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva ARM: shmobile: kzm9g: Use of_machine_is_compatible() ARM: shmobile: add sample amixer settings for armadillo800eva ARM: shmobile: add sample amixer settings for ap4evb ARM: shmobile: fix sample amixer settings for mackerel ARM: mackerel: include the correct .dtsi file Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/r8a7740-armadillo800eva.dts')
-rw-r--r--arch/arm/boot/dts/r8a7740-armadillo800eva.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index 52cfeadd2cdd..93da655b2598 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -9,7 +9,7 @@
*/
/dts-v1/;
-/include/ "skeleton.dtsi"
+/include/ "r8a7740.dtsi"
/ {
model = "armadillo 800 eva";