diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-03-14 20:23:25 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-14 20:23:25 +0100 |
| commit | 745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c (patch) | |
| tree | e556543ed86b7f49e4972d8ea048ff9e46592b4d /Documentation/sphinx/kerneldoc.py | |
| parent | x86/platform/intel-mid: Add special handling for ACPI HW reduced platforms (diff) | |
| parent | x86/mm: Fix vmalloc_fault to use pXd_large (diff) | |
| download | linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.tar.xz linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.zip | |
Merge branch 'x86/urgent' into x86/mm to pick up dependencies
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' |