diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
| commit | 3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch) | |
| tree | a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-mv78xx0/include/mach/debug-macro.S | |
| parent | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (diff) | |
| parent | 5839fec9d8db35b2b07359b18a77295418e239ad (diff) | |
Merge branch 'next/fixes' into next/cleanup
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-mv78xx0/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S index 04891428e48b..a7df02b049b7 100644 --- a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S +++ b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <mach/mv78xx0.h> | 9 | #include <mach/mv78xx0.h> |
| 10 | 10 | ||
| 11 | .macro addruart, rp, rv | 11 | .macro addruart, rp, rv, tmp |
| 12 | ldr \rp, =MV78XX0_REGS_PHYS_BASE | 12 | ldr \rp, =MV78XX0_REGS_PHYS_BASE |
| 13 | ldr \rv, =MV78XX0_REGS_VIRT_BASE | 13 | ldr \rv, =MV78XX0_REGS_VIRT_BASE |
| 14 | orr \rp, \rp, #0x00012000 | 14 | orr \rp, \rp, #0x00012000 |