diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-10-27 10:51:06 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2020-10-28 18:26:10 +0100 |
| commit | d29f34c098aa1b7e237ce9979eeb5cef9e5f162f (patch) | |
| tree | c8f13fc44ae991afe2bfe0c45c866d36d2f7afca /Documentation/conf.py | |
| parent | scripts: kernel-doc: use :c:union when needed (diff) | |
| download | linux-d29f34c098aa1b7e237ce9979eeb5cef9e5f162f.tar.xz linux-d29f34c098aa1b7e237ce9979eeb5cef9e5f162f.zip | |
sphinx: conf.py: properly handle Sphinx 4.0
One of the checks for Sphinx 3+ is broken, causing some
C warnings to return back with Sphinx 4.0.x.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/d5abc30056dafeec0778a46263a45401bdc7f11e.1603791716.git.mchehab+huawei@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/conf.py')
| -rw-r--r-- | Documentation/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py index 376dd0ddf39c..7ee05fd4cb17 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -50,7 +50,7 @@ if major >= 3: support for Sphinx v3.0 and above is brand new. Be prepared for possible issues in the generated output. ''') - if minor > 0 or patch >= 2: + if (major > 3) or (minor > 0 or patch >= 2): # Sphinx c function parser is more pedantic with regards to type # checking. Due to that, having macros at c:function cause problems. # Those needed to be scaped by using c_id_attributes[] array |