diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 17:11:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 17:11:09 +0200 |
| commit | 669c5d8d5f2be781d411ad8d52274038c795f257 (patch) | |
| tree | 86cc56ec1cb077b49e58f88c1427991e2b8fbcbc /drivers/media/platform/qcom/camss/camss-vfe-4-1.c | |
| parent | serial: docs: Fix filename for serial reference implementation (diff) | |
| parent | Linux 4.19-rc6 (diff) | |
| download | linux-669c5d8d5f2be781d411ad8d52274038c795f257.tar.xz linux-669c5d8d5f2be781d411ad8d52274038c795f257.zip | |
Merge 4.19-rc6 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/platform/qcom/camss/camss-vfe-4-1.c')
| -rw-r--r-- | drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c index da3a9fed9f2d..174a36be6f5d 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c @@ -9,6 +9,7 @@ */ #include <linux/interrupt.h> +#include <linux/io.h> #include <linux/iopoll.h> #include "camss-vfe.h" |