Pull cpuidle into release branch

[linux-2.6-omap-h63xx.git] / include / asm-arm / flat.h

diff --git a/include/asm-arm/flat.h b/include/asm-arm/flat.h
index 16f5375e57b89256738b094f1d07c6a45733087a..9918aa46d9e53c03983604b6b70237516d11d183 100644 (file)
--- 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__ */