diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 10:36:39 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 10:36:39 +0100 |
| commit | c24889167583c2e7fbd1a9e12ef508c8405f6fd4 (patch) | |
| tree | 4be6b8654d135b554253b6ab22c314260a413751 /Documentation/media/uapi/dvb/intro.rst | |
| parent | 38bf57fa7b671f2bf7530888aa8199450265c5c8 (diff) | |
| parent | 868c97a846a73e937d835b09b8c885a69df50ec8 (diff) | |
| download | linux-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.tar.gz linux-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.tar.bz2 linux-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.zip | |
Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next
Backmerge the docs-next branch from Jon into drm-misc so that we can
apply the dma-buf documentation cleanup patches. Git found a conflict
where there was none because both drm-misc and docs had identical
patches to clean up file rename issues in the rst include directives.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'Documentation/media/uapi/dvb/intro.rst')
| -rw-r--r-- | Documentation/media/uapi/dvb/intro.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/media/uapi/dvb/intro.rst b/Documentation/media/uapi/dvb/intro.rst index b61081d00a9f..2ed5c23102b4 100644 --- a/Documentation/media/uapi/dvb/intro.rst +++ b/Documentation/media/uapi/dvb/intro.rst @@ -55,8 +55,8 @@ Overview .. _stb_components: -.. figure:: intro_files/dvbstb.* - :alt: dvbstb.pdf / dvbstb.png +.. figure:: dvbstb.* + :alt: dvbstb.pdf / dvbstb.svg :align: center Components of a DVB card/STB |