diff options
| author | Patrick Boettcher <pboettcher@kernellabs.com> | 2009-08-17 09:34:41 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pboettcher@kernellabs.com> | 2009-08-17 09:34:41 +0200 |
| commit | 0dc1c1447192743fcb90d7e51d3e5fab897b5388 (patch) | |
| tree | e2855561db510382fb736bdc8ebe5f15af4e816b /linux/drivers/media/video/em28xx/em28xx-dvb.c | |
| parent | beae3fdb4940243ca65c75fea541535237e8e280 (diff) | |
| parent | d0e71c5a86eeb98ca96d280c22b030e9877c3520 (diff) | |
| download | mediapointer-dvb-s2-0dc1c1447192743fcb90d7e51d3e5fab897b5388.tar.gz mediapointer-dvb-s2-0dc1c1447192743fcb90d7e51d3e5fab897b5388.tar.bz2 | |
merge: from main
From: Patrick Boettcher <pboettcher@kernellabs.com>
merge: from main
Priority: normal
Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-dvb.c | 2 |
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); |