diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-30 22:36:57 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-30 22:36:57 +0200 |
| commit | 955e36d0b4d3e29c9c8a865d166a42718aed302e (patch) | |
| tree | 9913b327cc443e5eb3d399eafb9d460d9261d2f2 /Documentation/DocBook | |
| parent | ce31d9f4fc05964f6c0dd3a8661dc1a1d843a1e2 (diff) | |
| parent | c83155a6044341d67b85b441ba719f86058f6e2b (diff) | |
| download | op-kernel-dev-955e36d0b4d3e29c9c8a865d166a42718aed302e.zip op-kernel-dev-955e36d0b4d3e29c9c8a865d166a42718aed302e.tar.gz | |
Merge branch 'topic/skl-stage1' into drm-intel-next-queued
SKL stage 1 patches still need polish so will likely miss the 3.18
merge window. We've decided to postpone to 3.19 so let's pull this in
to make patch merging and conflict handling easier.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/drm.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 7ad6128..98528b4 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -3406,7 +3406,7 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis> <sect2> <title>Vertical Blanking and Interrupt Handling Functions Reference</title> !Edrivers/gpu/drm/drm_irq.c -!Iinclude/drm/drmP.h drm_crtc_vblank_waitqueue +!Finclude/drm/drmP.h drm_crtc_vblank_waitqueue </sect2> </sect1> |
