diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-11 16:43:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-11 16:43:22 -0500 |
| commit | 486936cd93e99c802153b3f2f629c5ce62b8c0d4 (patch) | |
| tree | 51e261a96e1fb6b51d4a6afb92bfc2480e150b6c /drivers/media/video/cx18/cx18-dvb.h | |
| parent | 1c1b777a5673b57a6c0377ba60a790d05e4a0676 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'drivers/media/video/cx18/cx18-dvb.h')
| -rw-r--r-- | drivers/media/video/cx18/cx18-dvb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-dvb.h b/drivers/media/video/cx18/cx18-dvb.h index bf8d8f6f5455..bbdcefc87f28 100644 --- a/drivers/media/video/cx18/cx18-dvb.h +++ b/drivers/media/video/cx18/cx18-dvb.h | |||
| @@ -23,3 +23,4 @@ | |||
| 23 | 23 | ||
| 24 | int cx18_dvb_register(struct cx18_stream *stream); | 24 | int cx18_dvb_register(struct cx18_stream *stream); |
| 25 | void cx18_dvb_unregister(struct cx18_stream *stream); | 25 | void cx18_dvb_unregister(struct cx18_stream *stream); |
| 26 | void cx18_dvb_work_handler(struct cx18 *cx); | ||