git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
ps3-hvcall.S
diff --git
a/arch/powerpc/boot/ps3-hvcall.S
b/arch/powerpc/boot/ps3-hvcall.S
index
c8b7df3
..
585965f
100644
(file)
--- a/
arch/powerpc/boot/ps3-hvcall.S
+++ b/
arch/powerpc/boot/ps3-hvcall.S
@@
-20,6
+20,8
@@
#include "ppc_asm.h"
+ .machine "ppc64"
+
/*
* The PS3 hypervisor uses a 64 bit "C" language calling convention.
* The routines here marshal arguments between the 32 bit wrapper