diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 07:28:56 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 07:28:56 -0400 |
commit | b6a4b7de4cb45ccf7157fc58de09c96f84d67108 (patch) | |
tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /lib/parser.c | |
parent | 2778d0d51dd5007c4909c1d9874f5e9097785a7a (diff) | |
parent | 651dab4264e4ba0e563f5ff56f748127246e9065 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers
Diffstat (limited to 'lib/parser.c')
-rw-r--r-- | lib/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/parser.c b/lib/parser.c index 4f0cbc03e0e8..b00d02059a5f 100644 --- a/lib/parser.c +++ b/lib/parser.c | |||
@@ -100,7 +100,7 @@ static int match_one(char *s, const char *p, substring_t args[]) | |||
100 | * format identifiers which will be taken into account when matching the | 100 | * format identifiers which will be taken into account when matching the |
101 | * tokens, and whose locations will be returned in the @args array. | 101 | * tokens, and whose locations will be returned in the @args array. |
102 | */ | 102 | */ |
103 | int match_token(char *s, match_table_t table, substring_t args[]) | 103 | int match_token(char *s, const match_table_t table, substring_t args[]) |
104 | { | 104 | { |
105 | const struct match_token *p; | 105 | const struct match_token *p; |
106 | 106 | ||