Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

[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 e79d1a7b6047d9e8b176ec87ca5d6061e0c4d2da..07086b427c22ea76ac26ddf45efb38369b7f59a4 100644 (file)
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -105,7 +105,7 @@ static struct drm_driver armada_drm_driver = {
        .desc                   = "Armada SoC DRM",
        .date                   = "20120730",
        .driver_features        = DRIVER_GEM | DRIVER_MODESET |
-                                 DRIVER_HAVE_IRQ | DRIVER_PRIME,
+                                 DRIVER_PRIME,
        .ioctls                 = armada_ioctls,
        .fops                   = &armada_drm_fops,
 };
@@ -274,7 +274,7 @@ static void armada_add_endpoints(struct device *dev,
                        continue;
                }
 
-               component_match_add(dev, match, compare_of, remote);
+               drm_of_component_match_add(dev, match, compare_of, remote);
                of_node_put(remote);
        }
 }