diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 17:03:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 17:03:37 +0200 |
| commit | 55f41297576ddb7868af2f13f3a8107178dee2d0 (patch) | |
| tree | 3279718be48a8eb48b3f90c545689dea8adbdd18 /arch/arm/boot | |
| parent | 0690f4f2ef487259e9ce39f575c48c89745058f2 (diff) | |
| parent | db347f1a5304d68c68c52f19971924b1e5842f3c (diff) | |
| download | linux-55f41297576ddb7868af2f13f3a8107178dee2d0.tar.gz | |
Merge tag 'mvebu-fixes-4.3-2' of git://git.infradead.org/linux-mvebu into fixes
Merge "mvebu fixes for 4.3 (part 2)" from Gregory CLEMENT: Fix wrong compatible for A385 DB AP preventing using suspend * tag 'mvebu-fixes-4.3-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: correct a385-db-ap compatible string
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-385-db-ap.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts index 89f5a95954ed..4047621b137e 100644 --- a/arch/arm/boot/dts/armada-385-db-ap.dts +++ b/arch/arm/boot/dts/armada-385-db-ap.dts @@ -46,7 +46,7 @@ / { model = "Marvell Armada 385 Access Point Development Board"; - compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x"; + compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada380"; chosen { stdout-path = "serial1:115200n8"; |