diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-10 14:50:25 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-10 14:50:25 +0100 |
| commit | 3e48ef43eddaa09646925f6383d08d98be8b79ec (patch) | |
| tree | c00f28356619745ff80faf34b92b696aaa8e2c5b /common | |
| parent | f4491d7b0404191a143aae3ee93fe04d396b3dea (diff) | |
| parent | 4b8ac386b3c8395694b2b28f934cd55a96f9553d (diff) | |
| download | barebox-3e48ef43eddaa09646925f6383d08d98be8b79ec.tar.gz barebox-3e48ef43eddaa09646925f6383d08d98be8b79ec.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'common')
| -rw-r--r-- | common/module.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/module.c b/common/module.c index 29f3eb78c6..c0ff0f224f 100644 --- a/common/module.c +++ b/common/module.c @@ -294,7 +294,6 @@ struct module * load_module(void *mod_image, unsigned long len) numsyms = sechdrs[symindex].sh_size / sizeof(Elf32_Sym); sym = (void *)sechdrs[symindex].sh_addr; -#ifdef CONFIG_COMMAND cmdindex = find_sec(ehdr, sechdrs, secstrings, ".barebox_cmd"); if (cmdindex) { struct command *cmd =(struct command *)sechdrs[cmdindex].sh_addr; @@ -303,7 +302,6 @@ struct module * load_module(void *mod_image, unsigned long len) cmd++; } } -#endif for (i = 0; i < numsyms; i++) { if (!strcmp(strtab + sym[i].st_name, MODULE_SYMBOL_PREFIX "init_module")) { |