diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:02:16 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:02:16 +0100 |
| commit | 3138d553f9181ecdaae3a7cfce6e8e1270f7cdcc (patch) | |
| tree | 3c2b654751fed47261fa77fb2571e0c7897bbfce /arch/arm/boot/dts | |
| parent | 08f87fd1f8d4c4bb7bc2473e63e01841997575a0 (diff) | |
| parent | dd94c6f646873c2f16b70e1cc82451fe1c2a83c6 (diff) | |
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.10-vexpress
Conflicts:
arch/arm/mach-vexpress/Makefile
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index b7d23fd5924b..a8a65cbe86b5 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -15,7 +15,7 @@ model = "V2P-CA15_CA7"; arm,hbi = <0x249>; arm,vexpress,site = <0xf>; - compatible = "arm,vexpress,v2p-ca15_a7", "arm,vexpress"; + compatible = "arm,vexpress,v2p-ca15_a7", "arm,vexpress", "arm,generic"; interrupt-parent = <&gic>; #address-cells = <2>; #size-cells = <2>; |