diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-30 10:33:06 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-30 10:33:06 +0300 |
commit | 3473065927a877e0a15c4d4b64f245ccaba24e3f (patch) | |
tree | 5d4ebdd84c192e8b2ca6c8f6be32e07f240c836c /drivers/media/test-drivers/vidtv/vidtv_tuner.h | |
parent | f80c21509984190b7fd462ed2c9ac5a294a99dc5 (diff) | |
parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
download | linux-3473065927a877e0a15c4d4b64f245ccaba24e3f.tar.xz |
Merge 5.10-rc6 into char-misc-next
We need the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/test-drivers/vidtv/vidtv_tuner.h')
-rw-r--r-- | drivers/media/test-drivers/vidtv/vidtv_tuner.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/test-drivers/vidtv/vidtv_tuner.h b/drivers/media/test-drivers/vidtv/vidtv_tuner.h index 8455b2d564b3..fd55346a5c87 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_tuner.h +++ b/drivers/media/test-drivers/vidtv/vidtv_tuner.h @@ -11,6 +11,7 @@ #define VIDTV_TUNER_H #include <linux/types.h> + #include <media/dvb_frontend.h> #define NUM_VALID_TUNER_FREQS 8 |