diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /include/asm-blackfin/module.h | |
parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-blackfin/module.h')
-rw-r--r-- | include/asm-blackfin/module.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-blackfin/module.h b/include/asm-blackfin/module.h index 3c7ce1644280..e3128df139d6 100644 --- a/include/asm-blackfin/module.h +++ b/include/asm-blackfin/module.h | |||
@@ -6,8 +6,6 @@ | |||
6 | #define Elf_Shdr Elf32_Shdr | 6 | #define Elf_Shdr Elf32_Shdr |
7 | #define Elf_Sym Elf32_Sym | 7 | #define Elf_Sym Elf32_Sym |
8 | #define Elf_Ehdr Elf32_Ehdr | 8 | #define Elf_Ehdr Elf32_Ehdr |
9 | #define FLG_CODE_IN_L1 0x10 | ||
10 | #define FLG_DATA_IN_L1 0x20 | ||
11 | 9 | ||
12 | struct mod_arch_specific { | 10 | struct mod_arch_specific { |
13 | Elf_Shdr *text_l1; | 11 | Elf_Shdr *text_l1; |
@@ -15,5 +13,8 @@ struct mod_arch_specific { | |||
15 | Elf_Shdr *bss_a_l1; | 13 | Elf_Shdr *bss_a_l1; |
16 | Elf_Shdr *data_b_l1; | 14 | Elf_Shdr *data_b_l1; |
17 | Elf_Shdr *bss_b_l1; | 15 | Elf_Shdr *bss_b_l1; |
16 | Elf_Shdr *text_l2; | ||
17 | Elf_Shdr *data_l2; | ||
18 | Elf_Shdr *bss_l2; | ||
18 | }; | 19 | }; |
19 | #endif /* _ASM_BFIN_MODULE_H */ | 20 | #endif /* _ASM_BFIN_MODULE_H */ |