diff options
| author | Mark Brown <broonie@kernel.org> | 2024-12-04 01:00:37 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-12-04 01:04:07 +0300 |
| commit | c41da3a620e611b16b62a5cf93168caf01252fc4 (patch) | |
| tree | 96115ba290db6ea1809507635d4e009a4790ee71 /scripts | |
| parent | 31823f27f84bfa06be20f98ec9be63a671307d63 (diff) | |
| parent | cdd30ebb1b9f36159d66f088b61aee264e649d7a (diff) | |
| download | linux-c41da3a620e611b16b62a5cf93168caf01252fc4.tar.xz | |
ASoC: Merge up origin to resolve interaction with manline symbol changes
Commit cdd30ebb1b9f ("module: Convert symbol namespace to string
literal") changes the arguments for various module symbol macros
including some that we've aded new uses for. Merge the commit up to
avoid problems in -next.
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/coccinelle/misc/add_namespace.cocci | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/coccinelle/misc/add_namespace.cocci b/scripts/coccinelle/misc/add_namespace.cocci index cbf1614163cb..d66c4e3cd946 100644 --- a/scripts/coccinelle/misc/add_namespace.cocci +++ b/scripts/coccinelle/misc/add_namespace.cocci @@ -13,7 +13,7 @@ virtual report declarer name MODULE_IMPORT_NS; identifier virtual.ns; @@ -MODULE_IMPORT_NS(ns); +MODULE_IMPORT_NS("ns"); // Add missing imports, but only adjacent to a MODULE_LICENSE statement. // That ensures we are adding it only to the main module source file. @@ -23,7 +23,7 @@ expression license; identifier virtual.ns; @@ MODULE_LICENSE(license); -+ MODULE_IMPORT_NS(ns); ++ MODULE_IMPORT_NS("ns"); // Dummy rule for report mode that would otherwise be empty and make spatch // fail ("No rules apply.") |