diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/asm-arm/div64.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/asm-arm/div64.h')
| -rw-r--r-- | include/asm-arm/div64.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/div64.h b/include/asm-arm/div64.h index 37e0a96e8789..0b5f881c3d85 100644 --- a/include/asm-arm/div64.h +++ b/include/asm-arm/div64.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define __ASM_ARM_DIV64 | 2 | #define __ASM_ARM_DIV64 |
| 3 | 3 | ||
| 4 | #include <asm/system.h> | 4 | #include <asm/system.h> |
| 5 | #include <linux/types.h> | ||
| 5 | 6 | ||
| 6 | /* | 7 | /* |
| 7 | * The semantics of do_div() are: | 8 | * The semantics of do_div() are: |
| @@ -223,4 +224,6 @@ | |||
| 223 | 224 | ||
| 224 | #endif | 225 | #endif |
| 225 | 226 | ||
| 227 | extern uint64_t div64_64(uint64_t dividend, uint64_t divisor); | ||
| 228 | |||
| 226 | #endif | 229 | #endif |