diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 09:51:52 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 09:51:52 -0600 |
| commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
| tree | 7064703c5d63d44700085cd701703457730bc06e /drivers/media/video/cx88/cx88.h | |
| parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
| download | blackbird-op-linux-ed7b44af3517441ba46b84da13773d24809ffdd3.tar.gz blackbird-op-linux-ed7b44af3517441ba46b84da13773d24809ffdd3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | drivers/media/video/cx88/cx88.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 60a8b3187f14..6025fdd23344 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h @@ -336,8 +336,8 @@ struct cx88_core { /* config info -- dvb */ #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); - void (*gate_ctrl)(struct cx88_core *core, int open); #endif + void (*gate_ctrl)(struct cx88_core *core, int open); /* state info */ struct task_struct *kthread; |
