diff options
Diffstat (limited to 'SOURCES/merge.pl')
| -rwxr-xr-x | SOURCES/merge.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/SOURCES/merge.pl b/SOURCES/merge.pl index 8c31815..dbaf592 100755 --- a/SOURCES/merge.pl +++ b/SOURCES/merge.pl @@ -20,6 +20,9 @@ while (<FILE>) { if (/\# ([\w]+) is not set/) { $configname = $1; + } elsif (/^\#/) { + # fall through on comments like 'avoid CONFIG_FOO=y' + ; } elsif (/([\w]+)=/) { $configname = $1; } @@ -40,6 +43,9 @@ while (<FILE2>) { if (/\# ([\w]+) is not set/) { $configname = $1; + } elsif (/^\#/) { + # fall through on comments like 'avoid CONFIG_FOO=y' + ; } elsif (/([\w]+)=/) { $configname = $1; } |