diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-10 11:39:52 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 11:39:52 -0500 |
| commit | 9c1852b459f04f6309e40d1d167512b0a5598529 (patch) | |
| tree | a74526f1fe3f9826b81327f0b9ba9b98a543f87c /net/lapb/lapb_timer.c | |
| parent | 9b41da80e09128574f09bed8dc5a5fc6f72a8239 (diff) | |
| parent | 7ce7d89f48834cefece7804d38fc5d85382edf77 (diff) | |
Merge tag 'v4.10-rc1' into asoc-samsung
Linux 4.10-rc1
Diffstat (limited to 'net/lapb/lapb_timer.c')
| -rw-r--r-- | net/lapb/lapb_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 355cc3b6fa4d..1a5535bc3b8d 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <linux/inet.h> | 29 | #include <linux/inet.h> |
| 30 | #include <linux/skbuff.h> | 30 | #include <linux/skbuff.h> |
| 31 | #include <net/sock.h> | 31 | #include <net/sock.h> |
| 32 | #include <asm/uaccess.h> | 32 | #include <linux/uaccess.h> |
| 33 | #include <linux/fcntl.h> | 33 | #include <linux/fcntl.h> |
| 34 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |