Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 222967
b: refs/heads/master
c: da8f2e2
h: refs/heads/master
i:
  222965: 8349c83
  222963: 0548cc3
  222959: f63f619
v: v3
  • Loading branch information
Olof Johansson authored and Linus Torvalds committed Dec 7, 2010
1 parent 0d07213 commit 6e7c624
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7787d2c2f440cc7854bed3d039bf4cc59d9e7897
refs/heads/master: da8f2e246183ae109f87694ee3f06e8fcca2931b
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-tegra/include/mach/debug-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <mach/io.h>

.macro addruart, rp, rv
ldreq \rp, =IO_APB_PHYS @ physical
ldrne \rv, =IO_APB_VIRT @ virtual
ldr \rp, =IO_APB_PHYS @ physical
ldr \rv, =IO_APB_VIRT @ virtual
#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
#error "A debug UART must be selected in the kernel config to use DEBUG_LL"
#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
Expand Down

0 comments on commit 6e7c624

Please sign in to comment.