diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-20 10:01:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-20 10:01:37 +0100 |
| commit | 3eb93ea3272d428aab3c03e2dd272a78a7729ba8 (patch) | |
| tree | 63ca8b7e7feccb109f4b5cb868939da395c7632f /Documentation/sphinx/kerneldoc.py | |
| parent | 5927145efd5de71976e62e2822511b13014d7e56 (diff) | |
| parent | 565977a3d929fc4427769117a8ac976ec16776d5 (diff) | |
| download | linux-3eb93ea3272d428aab3c03e2dd272a78a7729ba8.tar.gz linux-3eb93ea3272d428aab3c03e2dd272a78a7729ba8.tar.bz2 linux-3eb93ea3272d428aab3c03e2dd272a78a7729ba8.zip | |
Merge branch 'x86/mm' into x86/dma, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/sphinx/kerneldoc.py')
| -rw-r--r-- | Documentation/sphinx/kerneldoc.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py index 39aa9e8697cc..fbedcc39460b 100644 --- a/Documentation/sphinx/kerneldoc.py +++ b/Documentation/sphinx/kerneldoc.py @@ -36,8 +36,7 @@ import glob from docutils import nodes, statemachine from docutils.statemachine import ViewList -from docutils.parsers.rst import directives -from sphinx.util.compat import Directive +from docutils.parsers.rst import directives, Directive from sphinx.ext.autodoc import AutodocReporter __version__ = '1.0' |