diff --git a/[refs] b/[refs] index 391f39e5a196..2f0894a0930e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1e2ad07e78c4bbac9fce4d2e3c0fe60bce091d8 +refs/heads/master: 6b7eaf6e1428be33f731287de963862e3846cd42 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 725c59611e97..8cb9bfc7c14f 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -230,7 +230,7 @@ sub help { our $Member = qr{->$Ident|\.$Ident|\[[^]]*\]}; our $Lval = qr{$Ident(?:$Member)*}; -our $Constant = qr{(?i:(?:[0-9]+|0x[0-9a-f]+)[ul]*)}; +our $Constant = qr{(?i:(?:0x[0-9a-f]+|[0-9]+)[ul]*)}; our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)}; our $Compare = qr{<=|>=|==|!=|<|>}; our $Operators = qr{