diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 11:21:26 +0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 11:21:26 +0400 |
commit | b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5 (patch) | |
tree | 518ec8f4bfd316e91bcc30f434edb78529557eba /lib/div64.c | |
parent | 8a63b1994c500d4825ee73dc71502deffe5b135b (diff) | |
parent | 4bb2d1009f671815870e8f78e826e4f9071392a7 (diff) | |
download | linux-b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to add prerequisite for ARM ux500 crypto support.
Diffstat (limited to 'lib/div64.c')
-rw-r--r-- | lib/div64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/div64.c b/lib/div64.c index 5b4919191778..3ea24907d52e 100644 --- a/lib/div64.c +++ b/lib/div64.c @@ -16,7 +16,8 @@ * assembly versions such as arch/ppc/lib/div64.S and arch/sh/lib/div64.S. */ -#include <linux/module.h> +#include <linux/export.h> +#include <linux/kernel.h> #include <linux/math64.h> /* Not needed on 64bit architectures */ |