diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 20:17:33 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 20:17:33 +0400 |
| commit | ade63aada79c61bcd5f51cbd310f237399892268 (patch) | |
| tree | 4f8605528bfd9b6261679883974b9ac4870223dd /arch/arm/boot/dts/sun5i-a10s.dtsi | |
| parent | 9a1724c7506bfa7d3d9dcab13f83e9e6446929f9 (diff) | |
| parent | c14af233fbe279d0e561ecf84f1208b1bae087ef (diff) | |
| download | linux-ade63aada79c61bcd5f51cbd310f237399892268.tar.xz | |
Merge branch '3.14-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/arm/boot/dts/sun5i-a10s.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a10s.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index 64961595e8d6..79fd412005b0 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -383,7 +383,7 @@ }; rtp: rtp@01c25000 { - compatible = "allwinner,sun4i-ts"; + compatible = "allwinner,sun4i-a10-ts"; reg = <0x01c25000 0x100>; interrupts = <29>; }; |