diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-10 14:44:43 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-10 14:44:43 +0400 |
| commit | 967ad7f1489da7babbe0746f81c283458ecd3f84 (patch) | |
| tree | 812608fd6efcfe81096bd51b1ec1c2a4167385f6 /drivers/gpu/drm/udl/udl_drv.h | |
| parent | d7bf63f2465b3b6335dd66ffbf387768d81a59d5 (diff) | |
| parent | 6aba5b6cf098ba305fc31b23cc14114a16768d22 (diff) | |
| download | linux-967ad7f1489da7babbe0746f81c283458ecd3f84.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
The conflict in intel_drv.h tripped me up a bit since a patch in dinq
moves all the functions around, but another one in drm-next removes a
single function. So I'ev figured backing this into a backmerge would
be good.
i915_dma.c is just adjacent lines changed, nothing nefarious there.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_drv.h
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/udl/udl_drv.h')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_drv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 56aec9409fa3..1fbf7b357f16 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -115,7 +115,6 @@ int udl_dumb_create(struct drm_file *file_priv, int udl_gem_mmap(struct drm_file *file_priv, struct drm_device *dev, uint32_t handle, uint64_t *offset); -int udl_gem_init_object(struct drm_gem_object *obj); void udl_gem_free_object(struct drm_gem_object *gem_obj); struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, size_t size); |