mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4527/1: pxa: fix pxa27x ac97 cold reset in ASoC due to CKEN change [ARM] 4530/1: MXC: fix elf_hwcap compile breakage as in iop13xx [ARM] 4529/1: [HP Jornada 7XX] - Fix jornada720.c to use SSP driver [ARM] 4528/1: [HP Jornada 7XX] - Fix typo in jornada720_ssp.c [ARM] Remove CONFIG_IGNORE_FIQ [ARM] 4526/1: pxa: make ARCH_PXA select GENERIC_CLOCKEVENTS [ARM] setup_profiling_timer must not be __init
This commit is contained in:
commit
715dad5992
7 changed files with 21 additions and 20 deletions
|
|
@ -26,7 +26,6 @@
|
|||
#define __MXC_BOOT_UNCOMPRESS
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/processor.h>
|
||||
|
||||
#define UART(x) (*(volatile unsigned long *)(serial_port + (x)))
|
||||
|
||||
|
|
@ -62,7 +61,7 @@ static void putc(int ch)
|
|||
}
|
||||
|
||||
while (!(UART(USR2) & USR2_TXFE))
|
||||
cpu_relax();
|
||||
barrier();
|
||||
|
||||
UART(TXR) = ch;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue