diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-04-02 13:33:16 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-04-02 13:33:16 +0300 |
| commit | e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf (patch) | |
| tree | 5f762f2992658891c565af4f923147b384bf0dd4 /drivers/media/usb/tm6000/tm6000-dvb.c | |
| parent | f2ac256b9a8b7e79847efcd82bd10fd876369b9f (diff) | |
| parent | a5e13c6df0e41702d2b2c77c8ad41677ebb065b3 (diff) | |
| download | linux-e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf.tar.xz | |
Merge tag 'v5.12-rc5' into WIP.x86/core, to pick up recent NOP related changes
In particular we want to have this upstream commit:
b90829704780: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG")
... before merging in x86/cpu changes and the removal of the NOP optimizations, and
applying PeterZ's !retpoline objtool series.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/usb/tm6000/tm6000-dvb.c')
| -rw-r--r-- | drivers/media/usb/tm6000/tm6000-dvb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c index 293a460f4616..4990fa886d7a 100644 --- a/drivers/media/usb/tm6000/tm6000-dvb.c +++ b/drivers/media/usb/tm6000/tm6000-dvb.c @@ -23,8 +23,6 @@ MODULE_DESCRIPTION("DVB driver extension module for tm5600/6000/6010 based TV ca MODULE_AUTHOR("Mauro Carvalho Chehab"); MODULE_LICENSE("GPL"); -MODULE_SUPPORTED_DEVICE("{{Trident, tm5600},{{Trident, tm6000},{{Trident, tm6010}"); - static int debug; module_param(debug, int, 0644); |