Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fd3d72859b5fab00aba2e7ce5ca65744f6720769 Commit: fd3d72859b5fab00aba2e7ce5ca65744f6720769 Parent: df43309bd525bbe569978ca2a47415b7b07ee057 Author: Russell King <[EMAIL PROTECTED]> AuthorDate: Sat Oct 27 21:48:43 2007 +0100 Committer: Russell King <[EMAIL PROTECTED]> CommitDate: Wed Oct 31 15:21:42 2007 +0000
[ARM] nommu: fix breakage caused by f9720205d1f847cb59e197e851b5276425363f6b Someone forgot to use 'ls include/asm-*/flat.h' or 'grep -r flat_get_addr_from_rp .' to find all architectures which may be affected by their change. Fix the fall out. Noticed-by: Robert P. J. Day <[EMAIL PROTECTED]> Signed-off-by: Russell King <[EMAIL PROTECTED]> --- include/asm-arm/flat.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/asm-arm/flat.h b/include/asm-arm/flat.h index 16f5375..9918aa4 100644 --- a/include/asm-arm/flat.h +++ b/include/asm-arm/flat.h @@ -11,8 +11,9 @@ #define flat_argvp_envp_on_stack() 1 #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, persistent) 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 /* __ARM_FLAT_H__ */ - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html