Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus

[linux-2.6-block.git] / scripts / tags.sh

diff --git a/scripts/tags.sh b/scripts/tags.sh
index 26de7d5aa5c89a5fd4f051c67029341f4f8849fa..4fa070f9231ac2e78b5688d11b2463997302b482 100755 (executable)
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -203,7 +203,7 @@ regex_c=(
        '/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'
        '/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
        '/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
-       '/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'
+       '/\<\(DEFINE\|DECLARE\)_HASHTABLE(\([[:alnum:]_]*\)/\2/v/'
 )
 regex_kconfig=(
        '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/\2/'