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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
linux
/
cdrom.h
diff --git
a/include/linux/cdrom.h
b/include/linux/cdrom.h
index
282e9b7
..
0e46b2d
100644
(file)
--- a/
include/linux/cdrom.h
+++ b/
include/linux/cdrom.h
@@
-984,8
+984,8
@@
struct cdrom_device_ops {
extern int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip,
struct file *fp);
extern int cdrom_release(struct cdrom_device_info *cdi, struct file *fp);
extern int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip,
struct file *fp);
extern int cdrom_release(struct cdrom_device_info *cdi, struct file *fp);
-extern int cdrom_ioctl(struct
cdrom_device_info *cdi, struct inode *ip
,
- unsigned int cmd, unsigned long arg);
+extern int cdrom_ioctl(struct
file *file, struct cdrom_device_info *cdi
,
+
struct inode *ip,
unsigned int cmd, unsigned long arg);
extern int cdrom_media_changed(struct cdrom_device_info *);
extern int register_cdrom(struct cdrom_device_info *cdi);
extern int cdrom_media_changed(struct cdrom_device_info *);
extern int register_cdrom(struct cdrom_device_info *cdi);