diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 09:02:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 09:02:47 -0800 |
| commit | 51063a4ed955f82f408fc33cd9cc758e65a88808 (patch) | |
| tree | bf06c1e6a484306052ec20e6a4a80cc57ce6a8c4 /arch/arm/boot | |
| parent | 95e0d11f2dba54c1b0066e414d2b88a95908da9e (diff) | |
| parent | 42dd581bc4dba82e8756bb881fa974742250b4c6 (diff) | |
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')
| -rw-r--r-- | arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sh7372-mackerel.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 |
3 files changed, 3 insertions, 3 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"; diff --git a/arch/arm/boot/dts/sh7372-mackerel.dts b/arch/arm/boot/dts/sh7372-mackerel.dts index 2623de8e3497..8acf51e0cdae 100644 --- a/arch/arm/boot/dts/sh7372-mackerel.dts +++ b/arch/arm/boot/dts/sh7372-mackerel.dts @@ -9,7 +9,7 @@ */ /dts-v1/; -/include/ "skeleton.dtsi" +/include/ "sh7372.dtsi" / { model = "Mackerel (AP4 EVM 2nd)"; diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts index 9a438795315f..7c4071e7790c 100644 --- a/arch/arm/boot/dts/sh73a0-kzm9g.dts +++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts @@ -9,7 +9,7 @@ */ /dts-v1/; -/include/ "skeleton.dtsi" +/include/ "sh73a0.dtsi" / { model = "KZM-A9-GT"; |