diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-05 12:08:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-05 12:08:47 +1000 |
| commit | 4b0f3098674a61b2f346ec1f86a302b1a9b8fd30 (patch) | |
| tree | d7883290c4fc5e75d3b82b284dfeef9982215c7e /Documentation/DocBook | |
| parent | 88e7c8b9e5607b6b5a33da5bdfbad6a13f0df201 (diff) | |
| parent | dcdaab3ad1518eaf1ce31fd56d010c69a0754e06 (diff) | |
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/i915_drv.c
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/drm.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 9765a4c0829d..7c68ecc800a1 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -4067,7 +4067,7 @@ int num_ioctls;</synopsis> <title>DPIO</title> !Pdrivers/gpu/drm/i915/i915_reg.h DPIO <table id="dpiox2"> - <title>Dual channel PHY (VLV/CHV)</title> + <title>Dual channel PHY (VLV/CHV/BXT)</title> <tgroup cols="8"> <colspec colname="c0" /> <colspec colname="c1" /> @@ -4118,7 +4118,7 @@ int num_ioctls;</synopsis> </tgroup> </table> <table id="dpiox1"> - <title>Single channel PHY (CHV)</title> + <title>Single channel PHY (CHV/BXT)</title> <tgroup cols="4"> <colspec colname="c0" /> <colspec colname="c1" /> |