[Linux-stable-mirror] Patch "Revert "drm/armada: Fix compile fail"" has been added to the 3.18-stable tree