diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-24 07:38:20 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-24 07:38:20 +0300 |
commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /arch/powerpc/boot/ps3-hvcall.S | |
parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
download | linux-8d3c202be23c5a915f7053ebd4e96f44700c6a62.tar.xz |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'arch/powerpc/boot/ps3-hvcall.S')
-rw-r--r-- | arch/powerpc/boot/ps3-hvcall.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/ps3-hvcall.S b/arch/powerpc/boot/ps3-hvcall.S index 585965f7e6a8..d6068f1829ca 100644 --- a/arch/powerpc/boot/ps3-hvcall.S +++ b/arch/powerpc/boot/ps3-hvcall.S @@ -145,7 +145,7 @@ .macro STORE_REGS_5_2 lwz r11, 16(r1) std r4, 0(r11) - lwz r11, 24(r1) + lwz r11, 20(r1) std r5, 0(r11) .endm |