diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-04 00:34:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-04 00:34:07 +0200 |
| commit | 66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4 (patch) | |
| tree | 277fd9f6ae0ea7aaf34dbbcb5439bc8391068f4e /include/asm-sh/flat.h | |
| parent | ocfs2: Unlock mutex in local alloc failure case (diff) | |
| parent | Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki... (diff) | |
| download | linux-66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4.tar.xz linux-66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4.zip | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki <kalle.pokki@iki.fi>
Blackfin arch: gpio pinmux and resource allocation API required by BF537 on chip ethernet mac driver
Blackfin arch: add some missing syscall
binfmt_flat: checkpatch fixing minimum support for the blackfin relocations
Binfmt_flat: Add minimum support for the Blackfin relocations
Diffstat (limited to 'include/asm-sh/flat.h')
| -rw-r--r-- | include/asm-sh/flat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-sh/flat.h b/include/asm-sh/flat.h index 0d5cc04ab005..dc4f5950dafa 100644 --- a/include/asm-sh/flat.h +++ b/include/asm-sh/flat.h @@ -16,8 +16,9 @@ #define flat_argvp_envp_on_stack() 0 #define flat_old_ram_flag(flags) (flags) #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) -#define flat_get_addr_from_rp(rp, relval, flags) get_unaligned(rp) +#define flat_get_addr_from_rp(rp, relval, flags, p) get_unaligned(rp) #define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) #define flat_get_relocate_addr(rel) (rel) +#define flat_set_persistent(relval, p) 0 #endif /* __ASM_SH_FLAT_H */ |