summaryrefslogtreecommitdiff
path: root/Documentation/gpu/drm-internals.rst
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-03-11 13:46:03 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-03-11 13:46:03 +0300
commita45216547e8925078b18b2a6b539100c3814e973 (patch)
treefd07faaf4ad557152d71b336f9304c93075f41ed /Documentation/gpu/drm-internals.rst
parent35dc8aabc8783d6322a59d774af2858e5955d2ab (diff)
parent76adb460fd939756db689f238d5c2ddb45469705 (diff)
downloadlinux-a45216547e8925078b18b2a6b539100c3814e973.tar.xz
Merge branch 'drm/next/platform' of git://linuxtv.org/pinchartl/media into drm-misc-next
Merge Laurent's drm_platform removal code. Only conflict is with the drm_pci.h extraction, which allows me to fix up the misplayed drm_platform_init fumble that 0day and Stephen Rothwell reported. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'Documentation/gpu/drm-internals.rst')
-rw-r--r--Documentation/gpu/drm-internals.rst3
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
index b00bf8229080..3bb4d937cdfe 100644
--- a/Documentation/gpu/drm-internals.rst
+++ b/Documentation/gpu/drm-internals.rst
@@ -240,9 +240,6 @@ drivers.
.. kernel-doc:: drivers/gpu/drm/drm_pci.c
:export:
-.. kernel-doc:: drivers/gpu/drm/drm_platform.c
- :export:
-
Open/Close, File Operations and IOCTLs
======================================