diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-28 19:29:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-28 19:29:37 -0700 |
| commit | 715dad5992b1466320c1ac674db46297e57acf21 (patch) | |
| tree | 97855d63805137ff958f5a2c75f0bf47eb5f3ace /include | |
| parent | 1e4dcd22efa7d24f637ab2ea3a77dd65774eb005 (diff) | |
| parent | 0a9c2df263b2ef487e6b4015644cc18012d7411b (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-mxc/uncompress.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-arm/arch-mxc/uncompress.h b/include/asm-arm/arch-mxc/uncompress.h index ec5787d0e78..42cc0cb3fef 100644 --- a/include/asm-arm/arch-mxc/uncompress.h +++ b/include/asm-arm/arch-mxc/uncompress.h @@ -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; } |