diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-21 01:14:25 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-21 01:14:25 -0700 |
commit | 87eb367003887cdc81a5d183efea227b5b488961 (patch) | |
tree | 40f617e25a9364d573e3cd2189c9e7fa56c8a0fe /arch/arm/boot/compressed/head.S | |
parent | net: Remove two unnecessary exports (skbuff). (diff) | |
parent | net: Fix an RCU warning in dev_pick_tx() (diff) | |
download | linux-dev-87eb367003887cdc81a5d183efea227b5b488961.tar.xz linux-dev-87eb367003887cdc81a5d183efea227b5b488961.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
net/core/dev.c
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
-rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 0f23009170a1..6ab6b337a913 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -172,7 +172,7 @@ not_angel: adr r0, LC0 ARM( ldmia r0, {r1, r2, r3, r4, r5, r6, r11, ip, sp}) THUMB( ldmia r0, {r1, r2, r3, r4, r5, r6, r11, ip} ) - THUMB( ldr sp, [r0, #28] ) + THUMB( ldr sp, [r0, #32] ) subs r0, r0, r1 @ calculate the delta offset @ if delta is zero, we are |