summaryrefslogtreecommitdiff
path: root/scripts/kernel-doc
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2021-10-06 07:55:44 +0300
committerTony Lindgren <tony@atomide.com>2021-10-06 07:55:44 +0300
commite700ac213a0f793fb4f83098413303e3dd080892 (patch)
tree52130e5a24ec9ea55b2f81899b8a45bed0f17f7c /scripts/kernel-doc
parente879f855e590b40fe3c79f2fbd8f65ca3c724120 (diff)
parentb232537074fcaf0c2837abbb217429c097bb7598 (diff)
downloadlinux-e700ac213a0f793fb4f83098413303e3dd080892.tar.gz
linux-e700ac213a0f793fb4f83098413303e3dd080892.tar.bz2
linux-e700ac213a0f793fb4f83098413303e3dd080892.zip
Merge branch 'pruss-fix' into fixes
Merge in a fix for pruss reset issue caused by enabling pruss for am335x.
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-xscripts/kernel-doc8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 7c4a6a507ac4..cfcb60737957 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -329,10 +329,6 @@ if (defined($ENV{'KBUILD_VERBOSE'})) {
$verbose = "$ENV{'KBUILD_VERBOSE'}";
}
-if (defined($ENV{'KDOC_WERROR'})) {
- $Werror = "$ENV{'KDOC_WERROR'}";
-}
-
if (defined($ENV{'KCFLAGS'})) {
my $kcflags = "$ENV{'KCFLAGS'}";
@@ -341,6 +337,10 @@ if (defined($ENV{'KCFLAGS'})) {
}
}
+if (defined($ENV{'KDOC_WERROR'})) {
+ $Werror = "$ENV{'KDOC_WERROR'}";
+}
+
# Generated docbook code is inserted in a template at a point where
# docbook v3.1 requires a non-zero sequence of RefEntry's; see:
# https://www.oasis-open.org/docbook/documentation/reference/html/refentry.html