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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
333ada7
..
74ed585
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dvbdev.h
+++ b/
drivers/media/dvb/dvb-core/dvbdev.h
@@
-1,4
+1,4
@@
-/*
+/*
* dvbdev.h
*
* Copyright (C) 2000 Ralph Metzler & Marcus Metzler
* dvbdev.h
*
* Copyright (C) 2000 Ralph Metzler & Marcus Metzler
@@
-58,9
+58,6
@@
struct dvb_adapter {
struct dvb_device {
struct list_head list_head;
struct file_operations *fops;
struct dvb_device {
struct list_head list_head;
struct file_operations *fops;
-
-
-
struct dvb_adapter *adapter;
int type;
u32 id;
struct dvb_adapter *adapter;
int type;
u32 id;
@@
-71,19
+68,19
@@
struct dvb_device {
int writers;
int users;
int writers;
int users;
-
/* don't really need those !? -- FIXME: use video_usercopy */
-
int (*kernel_ioctl)(struct inode *inode, struct file *file,
+ /* don't really need those !? -- FIXME: use video_usercopy */
+ int (*kernel_ioctl)(struct inode *inode, struct file *file,
unsigned int cmd, void *arg);
void *priv;
};
unsigned int cmd, void *arg);
void *priv;
};
-extern int dvb_register_adapter (struct dvb_adapter *
*p
adap, const char *name, struct module *module);
+extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module);
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,
- struct dvb_device **pdvbdev,
+ struct dvb_device **pdvbdev,
const struct dvb_device *template,
void *priv,
int type);
const struct dvb_device *template,
void *priv,
int type);
@@
-100,9
+97,8
@@
we simply define out own dvb_usercopy(), which will hopefully become
generic_usercopy() someday... */
extern int dvb_usercopy(struct inode *inode, struct file *file,
generic_usercopy() someday... */
extern int dvb_usercopy(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg,
+ unsigned int cmd, unsigned long arg,
int (*func)(struct inode *inode, struct file *file,
unsigned int cmd, void *arg));
#endif /* #ifndef _DVBDEV_H_ */
int (*func)(struct inode *inode, struct file *file,
unsigned int cmd, void *arg));
#endif /* #ifndef _DVBDEV_H_ */
-