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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
dvb-core
/
dvbdev.h
diff --git
a/drivers/media/dvb/dvb-core/dvbdev.h
b/drivers/media/dvb/dvb-core/dvbdev.h
index
74ed585
..
7a7f75f
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dvbdev.h
+++ b/
drivers/media/dvb/dvb-core/dvbdev.h
@@
-27,7
+27,6
@@
#include <linux/poll.h>
#include <linux/fs.h>
#include <linux/list.h>
#include <linux/poll.h>
#include <linux/fs.h>
#include <linux/list.h>
-#include <linux/devfs_fs_kernel.h>
#include <linux/smp_lock.h>
#define DVB_MAJOR 212
#include <linux/smp_lock.h>
#define DVB_MAJOR 212
@@
-51,6
+50,8
@@
struct dvb_adapter {
u8 proposed_mac [6];
void* priv;
u8 proposed_mac [6];
void* priv;
+ struct device *device;
+
struct module *module;
};
struct module *module;
};
@@
-76,7
+77,7
@@
struct dvb_device {
};
};
-extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module);
+extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module
, struct device *device
);
extern int dvb_unregister_adapter (struct dvb_adapter *adap);
extern int dvb_register_device (struct dvb_adapter *adap,
extern int dvb_unregister_adapter (struct dvb_adapter *adap);
extern int dvb_register_device (struct dvb_adapter *adap,