Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/lst/linux into drm-next

[linux-2.6-block.git] / drivers / gpu / drm / rockchip / rockchip_drm_drv.c

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 8c8cbe837e61b41e900e26c3f3f19143e832c49a..2390c8577617adcb8061057d0260bbb717e53d64 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -20,6 +20,7 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
 #include <linux/dma-mapping.h>
 #include <linux/pm_runtime.h>
 #include <linux/module.h>
@@ -274,9 +275,7 @@ static const struct file_operations rockchip_drm_driver_fops = {
        .poll = drm_poll,
        .read = drm_read,
        .unlocked_ioctl = drm_ioctl,
-#ifdef CONFIG_COMPAT
        .compat_ioctl = drm_compat_ioctl,
-#endif
        .release = drm_release,
 };
 
@@ -388,7 +387,7 @@ static void rockchip_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);
        }
 }
@@ -437,7 +436,8 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev)
                }
 
                of_node_put(iommu);
-               component_match_add(dev, &match, compare_of, port->parent);
+               drm_of_component_match_add(dev, &match, compare_of,
+                                          port->parent);
                of_node_put(port);
        }