summaryrefslogtreecommitdiffstats
path: root/include/linux/parser.h
diff options
context:
space:
mode:
authorDmitry Torokhov2007-05-08 07:31:11 +0200
committerDmitry Torokhov2007-05-08 07:31:11 +0200
commit334d0dd8b660557608142f0f77abc6812b48f08b (patch)
tree9393a9aa099d7d42deda5f9f5054796c0c769be7 /include/linux/parser.h
parentInput: aaed2000_kbd - convert to use polldev library (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadkernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.tar.gz
kernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.tar.xz
kernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/parser.h')
-rw-r--r--include/linux/parser.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/parser.h b/include/linux/parser.h
index fa3332861a09..26b2bdfcaf06 100644
--- a/include/linux/parser.h
+++ b/include/linux/parser.h
@@ -11,7 +11,7 @@
/* associates an integer enumerator with a pattern string. */
struct match_token {
int token;
- char *pattern;
+ const char *pattern;
};
typedef struct match_token match_table_t[];
@@ -29,5 +29,5 @@ int match_token(char *, match_table_t table, substring_t args[]);
int match_int(substring_t *, int *result);
int match_octal(substring_t *, int *result);
int match_hex(substring_t *, int *result);
-void match_strcpy(char *, substring_t *);
-char *match_strdup(substring_t *);
+void match_strcpy(char *, const substring_t *);
+char *match_strdup(const substring_t *);