diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-24 15:16:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-24 15:16:41 +0200 |
| commit | 02214bfc89c71bcc5167f653994cfa5c57f10ff1 (patch) | |
| tree | 078e9eb79f9a58d996c959bcc935317f8cbecfa9 /drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
| parent | 324493fba77500592bbaa66421729421f139d4b5 (diff) | |
Merge tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Mauro briefly writes:
"media fixes for v4.19-rc5
some drivers and Kbuild fixes"
* tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: platform: fix cros-ec-cec build error
media: staging/media/mt9t031/Kconfig: remove bogus entry
media: i2c: mt9v111: Fix v4l2-ctrl error handling
media: camss: add missing includes
media: camss: Use managed memory allocations
media: camss: mark PM functions as __maybe_unused
media: af9035: prevent buffer overflow on write
media: video_function_calls.rst: drop obsolete video-set-attributes reference
Diffstat (limited to 'drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c')
| -rw-r--r-- | drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c index c832539397d7..12bce391d71f 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c @@ -12,6 +12,7 @@ #include <linux/delay.h> #include <linux/interrupt.h> +#include <linux/io.h> #define CAMSS_CSI_PHY_LNn_CFG2(n) (0x004 + 0x40 * (n)) #define CAMSS_CSI_PHY_LNn_CFG3(n) (0x008 + 0x40 * (n)) |