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/udivmodti4.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/udivmodti4.c')
| -rw-r--r-- | arch/powerpc/math-emu/udivmodti4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/math-emu/udivmodti4.c b/arch/powerpc/math-emu/udivmodti4.c index 7e112dc1e2f2..6172044ab003 100644 --- a/arch/powerpc/math-emu/udivmodti4.c +++ b/arch/powerpc/math-emu/udivmodti4.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* This has so very few changes over libgcc2's __udivmoddi4 it isn't funny. */ | 1 | /* This has so very few changes over libgcc2's __udivmoddi4 it isn't funny. */ |
| 2 | 2 | ||
| 3 | #include "soft-fp.h" | 3 | #include <math-emu/soft-fp.h> |
| 4 | 4 | ||
| 5 | #undef count_leading_zeros | 5 | #undef count_leading_zeros |
| 6 | #define count_leading_zeros __FP_CLZ | 6 | #define count_leading_zeros __FP_CLZ |