aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 01:12:49 -0800
committerOlof Johansson <olof@lixom.net>2012-11-21 02:13:12 -0800
commita33ee3e6949e244f9166a7f7e764886432304ecd (patch)
tree257ae924259d68bea516f833c9728d596e7757b5 /arch/arm/include
parent06f31cb0f601728f24b85c51972eee6bdc94a1d1 (diff)
parent52530343331dc111e0899bfc976f21ace5b5c95c (diff)
Merge tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux into next/soc
From Rob Herring: Use common debug_ll_init function and remove the static mapping code from mach-highbank. * tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux: ARM: highbank: use common debug_ll_io_init ARM: implement debug_ll_io_init()
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/mach/map.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index 195ac2f9d3d..2fe141fcc8d 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -40,6 +40,13 @@ extern void iotable_init(struct map_desc *, int);
extern void vm_reserve_area_early(unsigned long addr, unsigned long size,
void *caller);
+#ifdef CONFIG_DEBUG_LL
+extern void debug_ll_addr(unsigned long *paddr, unsigned long *vaddr);
+extern void debug_ll_io_init(void);
+#else
+static inline void debug_ll_io_init(void) {}
+#endif
+
struct mem_type;
extern const struct mem_type *get_mem_type(unsigned int type);
/*