diff options
author | Mark Brown <broonie@kernel.org> | 2020-07-31 21:54:03 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-07-31 21:54:03 +0300 |
commit | 84569f329f7fcb40b7b1860f273b2909dabf2a2b (patch) | |
tree | cd332fbb2947f20cc06e3b80da75b189c8ac624e /Documentation/sound | |
parent | c8f7dbdbaa15c700ea02abf92b8d9bda2e91050b (diff) | |
parent | 8e34f1e867b572f1e20b5250c2897fe5f041c99f (diff) | |
download | linux-84569f329f7fcb40b7b1860f273b2909dabf2a2b.tar.xz |
Merge remote-tracking branch 'asoc/for-5.9' into asoc-next
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/kernel-api/alsa-driver-api.rst | 2 | ||||
-rw-r--r-- | Documentation/sound/soc/dai.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/sound/kernel-api/alsa-driver-api.rst b/Documentation/sound/kernel-api/alsa-driver-api.rst index 14cd138989e3..c8cc651eccf7 100644 --- a/Documentation/sound/kernel-api/alsa-driver-api.rst +++ b/Documentation/sound/kernel-api/alsa-driver-api.rst @@ -99,7 +99,7 @@ ASoC Core API .. kernel-doc:: include/sound/soc.h .. kernel-doc:: sound/soc/soc-core.c .. kernel-doc:: sound/soc/soc-devres.c -.. kernel-doc:: sound/soc/soc-io.c +.. kernel-doc:: sound/soc/soc-component.c .. kernel-doc:: sound/soc/soc-pcm.c .. kernel-doc:: sound/soc/soc-ops.c .. kernel-doc:: sound/soc/soc-compress.c diff --git a/Documentation/sound/soc/dai.rst b/Documentation/sound/soc/dai.rst index 2e99183a7a47..009b07e5a0f3 100644 --- a/Documentation/sound/soc/dai.rst +++ b/Documentation/sound/soc/dai.rst @@ -17,7 +17,7 @@ frame (FRAME) (usually 48kHz) is always driven by the controller. Each AC97 frame is 21uS long and is divided into 13 time slots. The AC97 specification can be found at : -http://www.intel.com/p/en_US/business/design +https://www.intel.com/p/en_US/business/design I2S |