diff options
author | 2020-10-28 21:36:35 +0000 | |
---|---|---|
committer | 2020-10-28 21:36:35 +0000 | |
commit | ce038aeaee68f2e41c732b4b91c7185a1cac14b5 (patch) | |
tree | baa463fe66186edf19b3ca65d002f66dd75f09a1 /lib/math | |
parent | ASoC: codecs: wcd9335: Set digital gain range correctly (diff) | |
parent | Linux 5.10-rc1 (diff) | |
download | wireguard-linux-ce038aeaee68f2e41c732b4b91c7185a1cac14b5.tar.xz wireguard-linux-ce038aeaee68f2e41c732b4b91c7185a1cac14b5.zip |
Merge tag 'v5.10-rc1' into asoc-5.10
Linux 5.10-rc1
Diffstat (limited to 'lib/math')
-rw-r--r-- | lib/math/rational.c | 2 | ||||
-rw-r--r-- | lib/math/reciprocal_div.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/math/rational.c b/lib/math/rational.c index df75c8809693..9781d521963d 100644 --- a/lib/math/rational.c +++ b/lib/math/rational.c @@ -11,7 +11,7 @@ #include <linux/rational.h> #include <linux/compiler.h> #include <linux/export.h> -#include <linux/kernel.h> +#include <linux/minmax.h> /* * calculate best rational approximation for a given fraction diff --git a/lib/math/reciprocal_div.c b/lib/math/reciprocal_div.c index bf043258fa00..32436dd4171e 100644 --- a/lib/math/reciprocal_div.c +++ b/lib/math/reciprocal_div.c @@ -4,6 +4,7 @@ #include <asm/div64.h> #include <linux/reciprocal_div.h> #include <linux/export.h> +#include <linux/minmax.h> /* * For a description of the algorithm please have a look at |