diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-28 09:14:08 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-28 09:14:08 +0200 |
| commit | 96583ddbec291929880edefa2141c06c63e16aa5 (patch) | |
| tree | 6ae6bd3aec381d7461a687e3314bdf949798c554 /drivers/gpu/drm/tilcdc/tilcdc_external.c | |
| parent | 1353ec3833360ffab479d17781493ead1d38a006 (diff) | |
| parent | fb422950c6cd726fd36eb72a7cf84583440a18a2 (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework,
needed before we merge more i915 fencing patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/tilcdc/tilcdc_external.c')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.c b/drivers/gpu/drm/tilcdc/tilcdc_external.c index 68e895021005..06a4c584f3cb 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_external.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_external.c @@ -10,6 +10,7 @@ #include <linux/component.h> #include <linux/of_graph.h> +#include <drm/drm_of.h> #include "tilcdc_drv.h" #include "tilcdc_external.h" @@ -160,7 +161,8 @@ int tilcdc_get_external_components(struct device *dev, dev_dbg(dev, "Subdevice node '%s' found\n", node->name); if (match) - component_match_add(dev, match, dev_match_of, node); + drm_of_component_match_add(dev, match, dev_match_of, + node); of_node_put(node); count++; } |