diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 21:22:33 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 21:22:33 +0100 |
commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /scripts/genksyms | |
parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
download | op-kernel-dev-baea7b946f00a291b166ccae7fcfed6c01530cc6.zip op-kernel-dev-baea7b946f00a291b166ccae7fcfed6c01530cc6.tar.gz |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'scripts/genksyms')
-rw-r--r-- | scripts/genksyms/genksyms.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c index 3a8297b..af6b836 100644 --- a/scripts/genksyms/genksyms.c +++ b/scripts/genksyms/genksyms.c @@ -176,7 +176,7 @@ static int is_unknown_symbol(struct symbol *sym) strcmp(defn->string, "{") == 0); } -struct symbol *__add_symbol(const char *name, enum symbol_type type, +static struct symbol *__add_symbol(const char *name, enum symbol_type type, struct string_list *defn, int is_extern, int is_reference) { @@ -265,7 +265,7 @@ struct symbol *add_symbol(const char *name, enum symbol_type type, return __add_symbol(name, type, defn, is_extern, 0); } -struct symbol *add_reference_symbol(const char *name, enum symbol_type type, +static struct symbol *add_reference_symbol(const char *name, enum symbol_type type, struct string_list *defn, int is_extern) { return __add_symbol(name, type, defn, is_extern, 1); @@ -313,7 +313,7 @@ static int equal_list(struct string_list *a, struct string_list *b) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) -struct string_list *read_node(FILE *f) +static struct string_list *read_node(FILE *f) { char buffer[256]; struct string_list node = { |