[Linux-stable-mirror] [PATCH 3.18 29/64] Revert "drm/armada: Fix compile fail"