diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /drivers/media/video/cx23885/cx23885-dvb.c | |
| parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-dvb.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index e1aac07b3158..1c454128a9df 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
| @@ -502,6 +502,7 @@ static int dvb_register(struct cx23885_tsport *port) | |||
| 502 | break; | 502 | break; |
| 503 | } | 503 | } |
| 504 | case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H: | 504 | case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H: |
| 505 | case CX23885_BOARD_COMPRO_VIDEOMATE_E650F: | ||
| 505 | i2c_bus = &dev->i2c_bus[0]; | 506 | i2c_bus = &dev->i2c_bus[0]; |
| 506 | 507 | ||
| 507 | fe0->dvb.frontend = dvb_attach(zl10353_attach, | 508 | fe0->dvb.frontend = dvb_attach(zl10353_attach, |