summaryrefslogtreecommitdiff
path: root/Documentation/gpu/i915.rst
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-01-12 14:02:15 +0100
committerTakashi Iwai <tiwai@suse.de>2018-01-12 14:02:15 +0100
commit8999bd3c6323a3f3815b5c45628023f3a994b7a8 (patch)
tree6d4c4ef9de11d333d0ed0b3e0e1ea3b04e956c29 /Documentation/gpu/i915.rst
parent8ac60e733f7c9c41e4c125619a2f8390aca9d4db (diff)
parent4ac71d1b68365915bcde14d0ff8fda186ad377ac (diff)
Merge tag 'asoc-v4.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v4.16 Some more updates for v4.16, the big things here are the ST DFSDM driver and the IIO patches required to support that and even more in the neverending series of code quality improvements for x86, including Pierre's work to improve the Kconfig. The unused SN95031 driver and associated board support are also removed, they haven't been buildable for a considerable time without anyone noticing.
Diffstat (limited to 'Documentation/gpu/i915.rst')
-rw-r--r--Documentation/gpu/i915.rst5
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 2e7ee0313c1c..e94d3ac2bdd0 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -341,10 +341,7 @@ GuC
GuC-specific firmware loader
----------------------------
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
- :doc: GuC-specific firmware loader
-
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
+.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c
:internal:
GuC-based command submission