diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-03 15:34:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-03 15:34:07 -0700 |
| commit | 66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4 (patch) | |
| tree | 277fd9f6ae0ea7aaf34dbbcb5439bc8391068f4e /include/asm-v850/flat.h | |
| parent | bda0233b89c10ae46ccecb78bffdaf0fd7833d17 (diff) | |
| parent | cda6a20b68c1f21f4b4bc9cd3ee08494e7ebf0d5 (diff) | |
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-v850/flat.h')
| -rw-r--r-- | include/asm-v850/flat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-v850/flat.h b/include/asm-v850/flat.h index 3888f59d6881..17f0ea566611 100644 --- a/include/asm-v850/flat.h +++ b/include/asm-v850/flat.h @@ -25,6 +25,7 @@ #define flat_stack_align(sp) /* nothing needed */ #define flat_argvp_envp_on_stack() 0 #define flat_old_ram_flag(flags) (flags) +#define flat_set_persistent(relval, p) 0 /* We store the type of relocation in the top 4 bits of the `relval.' */ @@ -46,7 +47,8 @@ flat_get_relocate_addr (unsigned long relval) For the v850, RP should always be half-word aligned. */ static inline unsigned long flat_get_addr_from_rp (unsigned long *rp, unsigned long relval, - unsigned long flags) + unsigned long flags, + unsigned long *persistent) { short *srp = (short *)rp; |