diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-05 10:44:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-05 10:44:19 -0500 |
| commit | 7cda4cee1366fae236678a5a6b124bab86b14973 (patch) | |
| tree | 180bcb2d09e3db27050658afc36d5bac88593ed5 /lib | |
| parent | rtnetlink: ipv6: convert remaining users to rtnl_register_module (diff) | |
| parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ashldi3.c | 2 | ||||
| -rw-r--r-- | lib/ashrdi3.c | 2 | ||||
| -rw-r--r-- | lib/cmpdi2.c | 2 | ||||
| -rw-r--r-- | lib/lshrdi3.c | 2 | ||||
| -rw-r--r-- | lib/muldi3.c | 2 | ||||
| -rw-r--r-- | lib/ucmpdi2.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/ashldi3.c b/lib/ashldi3.c index 1b6087db95a5..3ffc46e3bb6c 100644 --- a/lib/ashldi3.c +++ b/lib/ashldi3.c @@ -16,7 +16,7 @@ #include <linux/export.h> -#include <lib/libgcc.h> +#include <linux/libgcc.h> long long notrace __ashldi3(long long u, word_type b) { diff --git a/lib/ashrdi3.c b/lib/ashrdi3.c index 2e67c97ac65a..ea054550f0e8 100644 --- a/lib/ashrdi3.c +++ b/lib/ashrdi3.c @@ -16,7 +16,7 @@ #include <linux/export.h> -#include <lib/libgcc.h> +#include <linux/libgcc.h> long long notrace __ashrdi3(long long u, word_type b) { diff --git a/lib/cmpdi2.c b/lib/cmpdi2.c index 6d7ebf6c2b86..2250da7e503e 100644 --- a/lib/cmpdi2.c +++ b/lib/cmpdi2.c @@ -16,7 +16,7 @@ #include <linux/export.h> -#include <lib/libgcc.h> +#include <linux/libgcc.h> word_type notrace __cmpdi2(long long a, long long b) { diff --git a/lib/lshrdi3.c b/lib/lshrdi3.c index 8e845f4bb65f..99cfa5721f2d 100644 --- a/lib/lshrdi3.c +++ b/lib/lshrdi3.c @@ -17,7 +17,7 @@ */ #include <linux/module.h> -#include <lib/libgcc.h> +#include <linux/libgcc.h> long long notrace __lshrdi3(long long u, word_type b) { diff --git a/lib/muldi3.c b/lib/muldi3.c index 88938543e10a..54c8b3123376 100644 --- a/lib/muldi3.c +++ b/lib/muldi3.c @@ -15,7 +15,7 @@ */ #include <linux/export.h> -#include <lib/libgcc.h> +#include <linux/libgcc.h> #define W_TYPE_SIZE 32 diff --git a/lib/ucmpdi2.c b/lib/ucmpdi2.c index 49a53505c8e3..25ca2d4c1e19 100644 --- a/lib/ucmpdi2.c +++ b/lib/ucmpdi2.c @@ -15,7 +15,7 @@ */ #include <linux/module.h> -#include <lib/libgcc.h> +#include <linux/libgcc.h> word_type __ucmpdi2(unsigned long long a, unsigned long long b) { |