diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-12-21 11:11:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-12-21 11:11:11 +0100 |
| commit | 24f171c7e145f43b9f187578e89b0982ce87e54c (patch) | |
| tree | 4044981e7fa714534981162dc390f15fbd4d3241 /scripts/kernel-doc.py | |
| parent | f7cede182c963720edd1e5fb50ea4f1c7eafa30e (diff) | |
| parent | 56d953a8d0da5e53c2594edde23465ec49385b1c (diff) | |
| download | linux-24f171c7e145f43b9f187578e89b0982ce87e54c.tar.gz linux-24f171c7e145f43b9f187578e89b0982ce87e54c.zip | |
Merge tag 'asoc-fix-v6.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.19
We've been quite busy with fixes since the merge window, though not in
any particularly exciting ways - the standout thing is the fix for _SX
controls which were broken by a change to how we do clamping, otherwise
it's all fairly run of the mill fixes and quirks.
Diffstat (limited to 'scripts/kernel-doc.py')
| -rwxr-xr-x | scripts/kernel-doc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kernel-doc.py b/scripts/kernel-doc.py index d9fe2bcbd39c..7a1eaf986bcd 100755 --- a/scripts/kernel-doc.py +++ b/scripts/kernel-doc.py @@ -111,7 +111,7 @@ import sys # Import Python modules -LIB_DIR = "lib/kdoc" +LIB_DIR = "../tools/lib/python" SRC_DIR = os.path.dirname(os.path.realpath(__file__)) sys.path.insert(0, os.path.join(SRC_DIR, LIB_DIR)) @@ -292,8 +292,8 @@ def main(): logger.warning("Python 3.7 or later is required for correct results") # Import kernel-doc libraries only after checking Python version - from kdoc_files import KernelFiles # pylint: disable=C0415 - from kdoc_output import RestFormat, ManFormat # pylint: disable=C0415 + from kdoc.kdoc_files import KernelFiles # pylint: disable=C0415 + from kdoc.kdoc_output import RestFormat, ManFormat # pylint: disable=C0415 if args.man: out_style = ManFormat(modulename=args.modulename) |