diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-01-16 15:32:06 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-16 23:30:06 +0100 |
| commit | a73b59c51ab288d81b515b504790267f594884b8 (patch) | |
| tree | 9ea3901be8344409e8294fd6f3a43e949051e762 /arch/arm/kernel | |
| parent | Merge tag 'sunxi-fixes-for-3.8-rc4' of git://github.com/mripard/linux into fixes (diff) | |
| download | linux-a73b59c51ab288d81b515b504790267f594884b8.tar.xz linux-a73b59c51ab288d81b515b504790267f594884b8.zip | |
ARM: compile fix for DEBUG_LL=y && MMU=n
debug_ll_addr is only used on machines with an MMU so it can be #ifdef'ed
out safely. This fixes:
arch/arm/kernel/debug.S: Assembler messages:
arch/arm/kernel/debug.S:104: Error: too many positional arguments
The problem was introduced in e5c5f2a ARM: implement debug_ll_io_init().
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/debug.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 6809200c31fb..14f7c3b14632 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -100,12 +100,14 @@ ENTRY(printch) b 1b ENDPROC(printch) +#ifdef CONFIG_MMU ENTRY(debug_ll_addr) addruart r2, r3, ip str r2, [r0] str r3, [r1] mov pc, lr ENDPROC(debug_ll_addr) +#endif #else |