diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2022-10-24 11:40:08 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2022-10-24 11:40:08 +0200 |
commit | 5349fad8f8a4b001557633d149850a14b2e1a3f0 (patch) | |
tree | ee9dbc231ebd91ea5c22fad8cb2b0c1bd5a14b57 /drivers/media/pci/cx88/cx88-video.c | |
parent | drm/bridge: ps8640: Add back the 50 ms mystery delay after HPD (diff) | |
parent | Linux 6.1-rc2 (diff) | |
download | linux-5349fad8f8a4b001557633d149850a14b2e1a3f0.tar.xz linux-5349fad8f8a4b001557633d149850a14b2e1a3f0.zip |
Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes
Update to v6.1-rc2 to grab more fixes.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/media/pci/cx88/cx88-video.c')
-rw-r--r-- | drivers/media/pci/cx88/cx88-video.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index b509c2a03852..c0ef03ed74f9 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c @@ -1388,6 +1388,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, } fallthrough; case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO: + case CX88_BOARD_NOTONLYTV_LV3H: request_module("ir-kbd-i2c"); } |