git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
media
/
video-buf-dvb.h
diff --git
a/include/media/video-buf-dvb.h
b/include/media/video-buf-dvb.h
index
b78d90f
..
8233caf
100644
(file)
--- a/
include/media/video-buf-dvb.h
+++ b/
include/media/video-buf-dvb.h
@@
-26,7
+26,8
@@
struct videobuf_dvb {
int videobuf_dvb_register(struct videobuf_dvb *dvb,
struct module *module,
- void *adapter_priv);
+ void *adapter_priv,
+ struct device *device);
void videobuf_dvb_unregister(struct videobuf_dvb *dvb);
/*