diff options
author | Patrick McHardy <kaber@trash.net> | 2014-01-14 12:38:12 +0000 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2014-01-14 12:38:12 +0000 |
commit | 4aa022a097e06edb677d37aca8633df55016f8f5 (patch) | |
tree | 882a0d47ddbcb78ce65101bb9b6196eb052e3221 /src/scanner.l | |
parent | 7d98127b61f5e530388ff2344ace69a292a9829d (diff) | |
parent | 7c358b1705ea1b7d2101c39a9c3b9e5773437096 (diff) |
Merge remote-tracking branch 'origin/master' into next-3.14
Diffstat (limited to 'src/scanner.l')
-rw-r--r-- | src/scanner.l | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l index 5a5ec723..0b8abacb 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -210,6 +210,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "$" { return '$'; } "=" { return '='; } "=>" { return ARROW; } +"vmap" { return VMAP; } "include" { return INCLUDE; } "define" { return DEFINE; } |