summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-07-17 09:56:00 +1000
committerDave Airlie <airlied@redhat.com>2015-07-17 09:56:00 +1000
commit375539832c8cde73fd12762cb7fd223c31b30de0 (patch)
tree4eaf3b735b4f56dd3117bb449bf5dc4ad08ca4e8 /Documentation
parent90438ac8134d9c5eff815e15d1ddfbc065bd8ead (diff)
parentc631d5f90e7ee246536c72f80ade86e9ef4d2f13 (diff)
downloadlinux-375539832c8cde73fd12762cb7fd223c31b30de0.tar.bz2
Merge tag 'topic/drm-fixes-2015-07-16' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Ok next attempt at drm-fixes pull. Big thing really is just the compat32 one for addfb2.1. * tag 'topic/drm-fixes-2015-07-16' of git://anongit.freedesktop.org/drm-intel: drm: Provide compat ioctl for addfb2.1 Documentation: drm: Fix tablulation in KMS properties table drm: add a check for x/y in drm_mode_setcrtc drm/rockchip: use drm_gem_mmap helpers
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/drm.tmpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index c0312cbd023d..2fb9a5457522 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -3383,7 +3383,7 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >TBD</td>
</tr>
<tr>
- <td rowspan="2" valign="top" >omap</td>
+ <td valign="top" >omap</td>
<td valign="top" >Generic</td>
<td valign="top" >“zorder”</td>
<td valign="top" >RANGE</td>