Merge v5.3-rc1 into drm-misc-next

[linux-2.6-block.git] / drivers / gpu / drm / armada / armada_drv.c

diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 521464f08ccd6a36a3e89f735ed0ff05bbb145ab..055c92bc88bf53d1f912d91f7723c53ef775da63 100644 (file)
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -40,8 +40,7 @@ static struct drm_driver armada_drm_driver = {
        .name                   = "armada-drm",
        .desc                   = "Armada SoC DRM",
        .date                   = "20120730",
-       .driver_features        = DRIVER_GEM | DRIVER_MODESET |
-                                 DRIVER_PRIME | DRIVER_ATOMIC,
+       .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
        .ioctls                 = armada_ioctls,
        .fops                   = &armada_drm_fops,
 };