diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /drivers/media/video/em28xx/em28xx-dvb.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-dvb.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-dvb.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index 4b992bc0083c..d2b1a1a52689 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c | |||
| @@ -452,6 +452,15 @@ static int dvb_init(struct em28xx *dev) | |||
| 452 | goto out_free; | 452 | goto out_free; |
| 453 | } | 453 | } |
| 454 | break; | 454 | break; |
| 455 | case EM2880_BOARD_KWORLD_DVB_310U: | ||
| 456 | dvb->frontend = dvb_attach(zl10353_attach, | ||
| 457 | &em28xx_zl10353_with_xc3028, | ||
| 458 | &dev->i2c_adap); | ||
| 459 | if (attach_xc3028(0x61, dev) < 0) { | ||
| 460 | result = -EINVAL; | ||
| 461 | goto out_free; | ||
| 462 | } | ||
| 463 | break; | ||
| 455 | default: | 464 | default: |
| 456 | printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card" | 465 | printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card" |
| 457 | " isn't supported yet\n", | 466 | " isn't supported yet\n", |