diff options
| author | Jon Medhurst <tixy@linaro.org> | 2017-04-10 18:15:08 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2017-04-10 18:15:08 +0100 |
| commit | 4e779ccb69b602a396eef4df2d37ec08634aac1f (patch) | |
| tree | fc6576fb3e3530c7aaf394a2238cc653e743714f | |
| parent | 2b692d6ba53298c7855843edfa9e47a78d6faec4 (diff) | |
| parent | 25915a2f43cd9d2b8f41f7dfdb8d5dca2ad4e81c (diff) | |
Merge branch 'latest-armlt-fvp' into latest-armltlatest-armlt-20170410
| -rw-r--r-- | arch/arm64/boot/dts/arm/fvp-base-aemv8a-aemv8a.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/arm/fvp-base-aemv8a-aemv8a.dts b/arch/arm64/boot/dts/arm/fvp-base-aemv8a-aemv8a.dts index eb9d35a61243..c88dc9a62585 100644 --- a/arch/arm64/boot/dts/arm/fvp-base-aemv8a-aemv8a.dts +++ b/arch/arm64/boot/dts/arm/fvp-base-aemv8a-aemv8a.dts @@ -9,7 +9,7 @@ / { model = "FVP_Base_AEMv8A-AEMv8A"; - compatible = "arm,fvp-base,aemv8a-aemv8a", "arm,fvp-base", "arm,vexpress"; + compatible = "arm,fvp-base,aemv8a-aemv8a", "arm,fvp-base"; interrupt-parent = <&gic>; #address-cells = <2>; #size-cells = <2>; |