net: handle the return value of pskb_carve_frag_list() correctly

[people/arne_f/kernel.git] / Documentation / conf.py

diff --git a/Documentation/conf.py b/Documentation/conf.py
index 63857d33778ce253b0b90dea8198ddab52a2bbe7..329c519158b6ee2938ed44b7c2408906c6f885f5 100644 (file)
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -37,7 +37,7 @@ needs_sphinx = '1.3'
 extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure']
 
 # The name of the math extension changed on Sphinx 1.4
-if major == 1 and minor > 3:
+if (major == 1 and minor > 3) or (major > 1):
     extensions.append("sphinx.ext.imgmath")
 else:
     extensions.append("sphinx.ext.pngmath")