diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 17:17:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 17:17:35 -0700 |
| commit | 6bec11921a7d7b11d0b1909596636632aece5a26 (patch) | |
| tree | 1bf2ac7d5c482afb2c5cf59c0fc7db7c7ac03ff6 /arch/arm/mm/proc-sa1100.S | |
| parent | 553cbf0a8f19c669bed82028988aa977558ef551 (diff) | |
| parent | db7e1bc479cc941c53839b18ff811c7def0c52e7 (diff) | |
| download | op-kernel-dev-6bec11921a7d7b11d0b1909596636632aece5a26.zip op-kernel-dev-6bec11921a7d7b11d0b1909596636632aece5a26.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
ARM: 6030/1: KS8695: enable console
ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
ARM: fix build error in arch/arm/kernel/process.c
Diffstat (limited to 'arch/arm/mm/proc-sa1100.S')
| -rw-r--r-- | arch/arm/mm/proc-sa1100.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S index ee77002..5c47760 100644 --- a/arch/arm/mm/proc-sa1100.S +++ b/arch/arm/mm/proc-sa1100.S @@ -45,7 +45,7 @@ ENTRY(cpu_sa1100_proc_init) mcr p15, 0, r0, c9, c0, 5 @ Allow read-buffer operations from userland mov pc, lr - .previous + .section .text /* * cpu_sa1100_proc_fin() |
