diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-13 22:25:38 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-13 22:25:38 +0100 |
| commit | 89ab216b33ba9405880fd3d89531305a931bc70f (patch) | |
| tree | 8f6428ce51ecaed6f6e1379c036dbe341eb71e34 /arch/arm/include/asm/flat.h | |
| parent | Merge tag 'omap-cleanup-b2-for-3.8' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-89ab216b33ba9405880fd3d89531305a931bc70f.tar.xz linux-89ab216b33ba9405880fd3d89531305a931bc70f.zip | |
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
Diffstat (limited to 'arch/arm/include/asm/flat.h')
| -rw-r--r-- | arch/arm/include/asm/flat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h index 59426a4595c9..e847d23351ed 100644 --- a/arch/arm/include/asm/flat.h +++ b/arch/arm/include/asm/flat.h @@ -8,7 +8,7 @@ #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, persistent) get_unaligned(rp) +#define flat_get_addr_from_rp(rp, relval, flags, persistent) ((void)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 |