ANDROID: modpost.c: fix up incorrect merge resolution
When merging changes done in scripts/mod/modpost.c I picked the wrong
"side" of the merge branches.
This fixes things up to match what is upstream identically at this point
in time, as there should not be any need for any changes in this file
right now.
Reported-by: Matthias Maennich <maennich@google.com>
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I014adb697866bc15a893f7a108bec361c525d7ad
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 77bba65..1eb902b 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2647,9 +2647,9 @@ int main(int argc, char **argv)
for (s = symbolhash[n]; s; s = s->next) {
if (s->is_static)
- warn("\"%s\" [%s] is a static %s\n",
- s->name, s->module->name,
- export_str(s->export));
+ error("\"%s\" [%s] is a static %s\n",
+ s->name, s->module->name,
+ export_str(s->export));
}
}