diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:02:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:02:54 +0200 |
| commit | 6a19c2100180747204e9e77fd0286061ff8a46d7 (patch) | |
| tree | 08102ce7c3719f7b2991fbc04f5f264017b1eec1 | |
| parent | 124bfc3b26e7772f24bd427bb9f9bcc061d9b191 (diff) | |
| parent | d7e86b9276b76e01a95bddc707150cc2282d36b3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 74b0d1d..a2da146 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -45,6 +45,7 @@ #include <linux/can/error.h> #include <linux/can/raw.h> +#include <linux/sockios.h> #include <errno.h> #include <unistd.h> #include <net/if.h> |