git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/msm8916' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
usb
/
em28xx
/
em28xx-dvb.c
diff --git
a/drivers/media/usb/em28xx/em28xx-dvb.c
b/drivers/media/usb/em28xx/em28xx-dvb.c
index 82edd37f0d733ddc263b5be4883ac314c133eaa3..4a7db623fe291031cec327a3189b866ffa14e843 100644
(file)
--- 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 */