diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-15 19:55:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-15 19:55:55 +1000 |
| commit | 19524f7c59c19854caf5b82d89bc558e38da5790 (patch) | |
| tree | 92abeba64bc3aa9f4bde7e6d98d8215602069b18 /drivers/gpu/drm/drm_gem.c | |
| parent | 98faa78ce7f1f986e11e7805d31b409782a6d2d4 (diff) | |
| parent | d0fa1af40e784aaf7ebb7ba8a17b229bb3fa4c21 (diff) | |
Merge tag 'topic/core-stuff-2014-09-15' of git://anongit.freedesktop.org/drm-intel into drm-next
Here's the updated topic/core-stuff pull request with the two patches
already merged into drm-fixes dropped.
* tag 'topic/core-stuff-2014-09-15' of git://anongit.freedesktop.org/drm-intel:
drm: Drop modeset locking from crtc init function
drm/i915/hdmi: Enable pipe pixel replication for SD interlaced modes
drm/edid: Reduce horizontal timings for pixel replicated modes
drm: Include task->name and master status in debugfs clients info
drm/gem: Fix kerneldoc typo
drm: use c99 initializers in structures
drm: fix drm_modeset_lock.h kernel-doc notation
Diffstat (limited to 'drivers/gpu/drm/drm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 55fd65002926..eb5dd67153e4 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -147,7 +147,7 @@ int drm_gem_object_init(struct drm_device *dev, EXPORT_SYMBOL(drm_gem_object_init); /** - * drm_gem_object_init - initialize an allocated private GEM object + * drm_gem_private_object_init - initialize an allocated private GEM object * @dev: drm_device the object should be initialized for * @obj: drm_gem_object to initialize * @size: object size |