diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/blackfin/include/asm/module.h | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/blackfin/include/asm/module.h')
| -rw-r--r-- | arch/blackfin/include/asm/module.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/module.h b/arch/blackfin/include/asm/module.h index 9c1cfffddd9b..4282b169ead9 100644 --- a/arch/blackfin/include/asm/module.h +++ b/arch/blackfin/include/asm/module.h | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | #ifndef _ASM_BFIN_MODULE_H | 7 | #ifndef _ASM_BFIN_MODULE_H |
| 8 | #define _ASM_BFIN_MODULE_H | 8 | #define _ASM_BFIN_MODULE_H |
| 9 | 9 | ||
| 10 | #define MODULE_SYMBOL_PREFIX "_" | ||
| 11 | |||
| 12 | #define Elf_Shdr Elf32_Shdr | 10 | #define Elf_Shdr Elf32_Shdr |
| 13 | #define Elf_Sym Elf32_Sym | 11 | #define Elf_Sym Elf32_Sym |
| 14 | #define Elf_Ehdr Elf32_Ehdr | 12 | #define Elf_Ehdr Elf32_Ehdr |