diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 13:12:49 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 14:13:12 +0400 |
| commit | a33ee3e6949e244f9166a7f7e764886432304ecd (patch) | |
| tree | 257ae924259d68bea516f833c9728d596e7757b5 /arch/arm/mach-highbank/core.h | |
| parent | 06f31cb0f601728f24b85c51972eee6bdc94a1d1 (diff) | |
| parent | 52530343331dc111e0899bfc976f21ace5b5c95c (diff) | |
| download | linux-a33ee3e6949e244f9166a7f7e764886432304ecd.tar.xz | |
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/mach-highbank/core.h')
| -rw-r--r-- | arch/arm/mach-highbank/core.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h index 068c68795c8c..80235b46cb58 100644 --- a/arch/arm/mach-highbank/core.h +++ b/arch/arm/mach-highbank/core.h @@ -5,11 +5,6 @@ extern void highbank_set_cpu_jump(int cpu, void *jump_addr); extern void highbank_clocks_init(void); extern void highbank_restart(char, const char *); extern void __iomem *scu_base_addr; -#ifdef CONFIG_DEBUG_HIGHBANK_UART -extern void highbank_lluart_map_io(void); -#else -static inline void highbank_lluart_map_io(void) {} -#endif #ifdef CONFIG_PM_SLEEP extern void highbank_pm_init(void); |