diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 16:25:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 16:25:13 +1000 |
| commit | f015b8a01943179b618b3c6c3f50ecef91e1fcad (patch) | |
| tree | 7237457a72c5522133b8a62b5b4f4cc47c9bd8a3 /Documentation/DocBook | |
| parent | d320ed26bf39afebd9960309df59788536fb8c00 (diff) | |
| parent | 68f965a6028f4916195b689e3a6a557254782516 (diff) | |
Merge remote-tracking branch 'dma-buf/for-next'
Conflicts:
drivers/gpu/drm/i915/i915_gem_dmabuf.c
drivers/staging/android/sync.c
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index cc63f30de16..6ca7a11fb89 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -129,6 +129,9 @@ X!Edrivers/base/interface.c </sect1> <sect1><title>Device Drivers DMA Management</title> !Edrivers/base/dma-buf.c +!Edrivers/base/fence.c +!Iinclude/linux/fence.h +!Iinclude/linux/seqno-fence.h !Edrivers/base/reservation.c !Iinclude/linux/reservation.h !Edrivers/base/dma-coherent.c |