diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-12-11 15:10:40 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-12-11 15:10:40 +0300 |
commit | 6643aab30f88e2929bcc401a9ae39bf6f1c0b61d (patch) | |
tree | 72c43e9d7287aef9b8d9699491038edc1929f1f2 /arch/arm/lib/div64.S | |
parent | 8fb9dcbdc3619741c10c573199d804161c34c89a (diff) | |
parent | 045169816b31b10faed984b01c390db1b32ee4c1 (diff) | |
download | linux-6643aab30f88e2929bcc401a9ae39bf6f1c0b61d.tar.xz |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/lib/div64.S')
-rw-r--r-- | arch/arm/lib/div64.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/lib/div64.S b/arch/arm/lib/div64.S index 0c9e1c18fc9e..a9eafe4981eb 100644 --- a/arch/arm/lib/div64.S +++ b/arch/arm/lib/div64.S @@ -15,7 +15,6 @@ #include <linux/linkage.h> #include <asm/assembler.h> #include <asm/unwind.h> -#include <asm/export.h> #ifdef __ARMEB__ #define xh r0 @@ -211,4 +210,3 @@ Ldiv0_64: UNWIND(.fnend) ENDPROC(__do_div64) -EXPORT_SYMBOL(__do_div64) |