diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:40 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:40 +0100 |
| commit | b25da59f91790bcc9bf5ceeb226c8bd0c7e855d8 (patch) | |
| tree | fe5153754d15363e592d25140206f51068cd7be4 /arch/arm/boot/dts/vexpress-v2p-ca5s.dts | |
| parent | c28abb089f55b56218b33c1057e33952b3278083 (diff) | |
| parent | 0b90f81c17a02e3d41610c93a4047d01e0fb6830 (diff) | |
Merge branch 'tracking-armlt-ve-updates' into lsk-3.9-vexpress
Diffstat (limited to 'arch/arm/boot/dts/vexpress-v2p-ca5s.dts')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts index 6328cbc71d3..c544a550459 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts @@ -111,7 +111,7 @@ }; pmu { - compatible = "arm,cortex-a5-pmu", "arm,cortex-a9-pmu"; + compatible = "arm,cortex-a5-pmu"; interrupts = <0 68 4>, <0 69 4>; }; |