diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 12:02:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 12:02:26 +0200 |
| commit | 1ccb2f4e8e435a53bb378e8b092087f091754aa6 (patch) | |
| tree | ba120509947138915e06ad39cca5f065bd99f42f /drivers/media/usb/em28xx/em28xx-dvb.c | |
| parent | c3a3800fe46f00ceeeb181cc07cc4fdaed4574f1 (diff) | |
| parent | 9b231d9f47c6114d317ce28cff92a74ad80547f5 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-dvb.c')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-dvb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c index 82edd37f0d73..4a7db623fe29 100644 --- a/drivers/media/usb/em28xx/em28xx-dvb.c +++ b/drivers/media/usb/em28xx/em28xx-dvb.c @@ -1522,6 +1522,7 @@ static int em28xx_dvb_init(struct em28xx *dev) break; case EM2884_BOARD_ELGATO_EYETV_HYBRID_2008: case EM2884_BOARD_CINERGY_HTC_STICK: + case EM2884_BOARD_TERRATEC_H6: terratec_htc_stick_init(dev); /* attach demodulator */ |