diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
---|---|---|
committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /arch/powerpc/math-emu/mcrfs.c | |
parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'arch/powerpc/math-emu/mcrfs.c')
-rw-r--r-- | arch/powerpc/math-emu/mcrfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c index 41ba247faf89..e948d5708e2b 100644 --- a/arch/powerpc/math-emu/mcrfs.c +++ b/arch/powerpc/math-emu/mcrfs.c | |||
@@ -2,7 +2,8 @@ | |||
2 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
3 | #include <asm/uaccess.h> | 3 | #include <asm/uaccess.h> |
4 | 4 | ||
5 | #include "soft-fp.h" | 5 | #include <asm/sfp-machine.h> |
6 | #include <math-emu/soft-fp.h> | ||
6 | 7 | ||
7 | int | 8 | int |
8 | mcrfs(u32 *ccr, u32 crfD, u32 crfS) | 9 | mcrfs(u32 *ccr, u32 crfD, u32 crfS) |