GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 05:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse source 
Conflicts:
	include/linux/mod_devicetable.h
	scripts/mod/file2alias.c
This commit is contained in:
David S. Miller 2010-05-18 23:01:55 -07:00
commit 2ec8c6bb5d
577 changed files with 24623 additions and 14821 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/mod/file2alias.c
View file

@ -818,6 +818,16 @@ static int do_mdio_entry(const char *filename,
return 1;
}
/* Looks like: zorro:iN. */
static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
char *alias)
{
id->id = TO_NATIVE(id->id);
strcpy(alias, "zorro:");
ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id);
return 1;
}
/* Ignore any prefix, eg. some architectures prepend _ */
static inline int sym_is(const char *symbol, const char *name)
{
@ -969,6 +979,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
do_table(symval, sym->st_size,
sizeof(struct mdio_device_id), "mdio",
do_mdio_entry, mod);
else if (sym_is(symname, "__mod_zorro_device_table"))
do_table(symval, sym->st_size,
sizeof(struct zorro_device_id), "zorro",
do_zorro_entry, mod);
free(zeros);
}