diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
| commit | 09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch) | |
| tree | acdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/mach-mmp/include/mach/debug-macro.S | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/debug-macro.S b/arch/arm/mach-mmp/include/mach/debug-macro.S index 7e2ebd3efc7c..b6f14d203c25 100644 --- a/arch/arm/mach-mmp/include/mach/debug-macro.S +++ b/arch/arm/mach-mmp/include/mach/debug-macro.S | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <mach/addr-map.h> | 12 | #include <mach/addr-map.h> |
| 13 | 13 | ||
| 14 | .macro addruart, rp, rv | 14 | .macro addruart, rp, rv, tmp |
| 15 | ldr \rp, =APB_PHYS_BASE @ physical | 15 | ldr \rp, =APB_PHYS_BASE @ physical |
| 16 | ldr \rv, =APB_VIRT_BASE @ virtual | 16 | ldr \rv, =APB_VIRT_BASE @ virtual |
| 17 | orr \rp, \rp, #0x00017000 | 17 | orr \rp, \rp, #0x00017000 |