OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[uclinux-h8/linux.git]
/
Documentation
/
DocBook
/
drm.tmpl
diff --git
a/Documentation/DocBook/drm.tmpl
b/Documentation/DocBook/drm.tmpl
index
c0312cb
..
2fb9a54
100644
(file)
--- 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>