diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-05 23:18:49 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-05 23:18:49 +0200 |
| commit | 186a73dc9a81b087d0708f21a990615957ec9c1c (patch) | |
| tree | a1db8d517665fb27f25d44eacacd4b80a0d540ed /arch/arm/include/debug/zynq.S | |
| parent | Merge tag 'versatile-leds' of git://git.kernel.org/pub/scm/linux/kernel/git/l... (diff) | |
| parent | ARM: qcom: clean-up unneeded kconfig selects (diff) | |
| download | linux-186a73dc9a81b087d0708f21a990615957ec9c1c.tar.xz linux-186a73dc9a81b087d0708f21a990615957ec9c1c.zip | |
Merge tag 'kconfig-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/cleanup
Merge Kconfig cleanups from Rob Herring:
Several mach kconfig clean-ups of redundant selects
* tag 'kconfig-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
ARM: qcom: clean-up unneeded kconfig selects
ARM: bcm: clean-up unneeded kconfig selects
ARM: mvebu: clean-up unneeded kconfig selects
+ Linux 3.15-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/include/debug/zynq.S')
| -rw-r--r-- | arch/arm/include/debug/zynq.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/debug/zynq.S b/arch/arm/include/debug/zynq.S index f9aa9740a73f..0b762fafa758 100644 --- a/arch/arm/include/debug/zynq.S +++ b/arch/arm/include/debug/zynq.S @@ -42,6 +42,9 @@ .endm .macro waituart,rd,rx +1001: ldr \rd, [\rx, #UART_SR_OFFSET] + tst \rd, #UART_SR_TXEMPTY + beq 1001b .endm .macro busyuart,rd,rx |