diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /include/media/video-buf-dvb.h | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'include/media/video-buf-dvb.h')
| -rw-r--r-- | include/media/video-buf-dvb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/video-buf-dvb.h b/include/media/video-buf-dvb.h index b78d90fe629f..8233cafdeef6 100644 --- a/include/media/video-buf-dvb.h +++ b/include/media/video-buf-dvb.h | |||
| @@ -26,7 +26,8 @@ struct videobuf_dvb { | |||
| 26 | 26 | ||
| 27 | int videobuf_dvb_register(struct videobuf_dvb *dvb, | 27 | int videobuf_dvb_register(struct videobuf_dvb *dvb, |
| 28 | struct module *module, | 28 | struct module *module, |
| 29 | void *adapter_priv); | 29 | void *adapter_priv, |
| 30 | struct device *device); | ||
| 30 | void videobuf_dvb_unregister(struct videobuf_dvb *dvb); | 31 | void videobuf_dvb_unregister(struct videobuf_dvb *dvb); |
| 31 | 32 | ||
| 32 | /* | 33 | /* |