summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx-dvb.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-11 13:56:40 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-08-11 13:56:40 -0300
commit6971a9d650f6ab06dfedc4464665366c87da4bbc (patch)
tree6274d376e8d2ee13a4fecb2d0f9e294bc35935ef /linux/drivers/media/video/em28xx/em28xx-dvb.c
parent6355bbe94603dee693331f5ae62c8c1a109a8007 (diff)
parent796c449e9807bc070a33bcbbab2f4cae6cfc6d14 (diff)
downloadmediapointer-dvb-s2-6971a9d650f6ab06dfedc4464665366c87da4bbc.tar.gz
mediapointer-dvb-s2-6971a9d650f6ab06dfedc4464665366c87da4bbc.tar.bz2
merge: http://www.kernellabs.com/hg/~dheitmueller/ttxs-remote/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-dvb.c')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-dvb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-dvb.c b/linux/drivers/media/video/em28xx/em28xx-dvb.c
index e32267383..3d522d547 100644
--- a/linux/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c
@@ -479,7 +479,6 @@ static int dvb_init(struct em28xx *dev)
}
break;
case EM2880_BOARD_KWORLD_DVB_310U:
- case EM2880_BOARD_EMPIRE_DUAL_TV:
dvb->frontend = dvb_attach(zl10353_attach,
&em28xx_zl10353_with_xc3028,
&dev->i2c_adap);
@@ -489,6 +488,7 @@ static int dvb_init(struct em28xx *dev)
}
break;
case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
+ case EM2880_BOARD_EMPIRE_DUAL_TV:
dvb->frontend = dvb_attach(zl10353_attach,
&em28xx_zl10353_xc3028_no_i2c_gate,
&dev->i2c_adap);