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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
scsi
/
sr_vendor.c
diff --git
a/drivers/scsi/sr_vendor.c
b/drivers/scsi/sr_vendor.c
index
6fb9752
..
bd7bd57
100644
(file)
--- a/
drivers/scsi/sr_vendor.c
+++ b/
drivers/scsi/sr_vendor.c
@@
-41,7
+41,7
@@
#include <linux/blkdev.h>
#include "scsi.h"
#include <linux/blkdev.h>
#include "scsi.h"
-#include
"hosts.h"
+#include
<scsi/scsi_host.h>
#include <scsi/scsi_ioctl.h>
#include <linux/cdrom.h>
#include <scsi/scsi_ioctl.h>
#include <linux/cdrom.h>
@@
-107,7
+107,7
@@
void sr_vendor_init(Scsi_CD *cd)
int sr_set_blocklength(Scsi_CD *cd, int blocklength)
{
unsigned char *buffer; /* the buffer for the ioctl */
int sr_set_blocklength(Scsi_CD *cd, int blocklength)
{
unsigned char *buffer; /* the buffer for the ioctl */
- struct
cdrom_generic
_command cgc;
+ struct
packet
_command cgc;
struct ccs_modesel_head *modesel;
int rc, density = 0;
struct ccs_modesel_head *modesel;
int rc, density = 0;
@@
-123,7
+123,7
@@
int sr_set_blocklength(Scsi_CD *cd, int blocklength)
#ifdef DEBUG
printk("%s: MODE SELECT 0x%x/%d\n", cd->cdi.name, density, blocklength);
#endif
#ifdef DEBUG
printk("%s: MODE SELECT 0x%x/%d\n", cd->cdi.name, density, blocklength);
#endif
- memset(&cgc, 0, sizeof(struct
cdrom_generic
_command));
+ memset(&cgc, 0, sizeof(struct
packet
_command));
cgc.cmd[0] = MODE_SELECT;
cgc.cmd[1] = (1 << 4);
cgc.cmd[4] = 12;
cgc.cmd[0] = MODE_SELECT;
cgc.cmd[1] = (1 << 4);
cgc.cmd[4] = 12;
@@
-157,7
+157,7
@@
int sr_cd_check(struct cdrom_device_info *cdi)
Scsi_CD *cd = cdi->handle;
unsigned long sector;
unsigned char *buffer; /* the buffer for the ioctl */
Scsi_CD *cd = cdi->handle;
unsigned long sector;
unsigned char *buffer; /* the buffer for the ioctl */
- struct
cdrom_generic
_command cgc;
+ struct
packet
_command cgc;
int rc, no_multi;
if (cd->cdi.mask & CDC_MULTI_SESSION)
int rc, no_multi;
if (cd->cdi.mask & CDC_MULTI_SESSION)
@@
-171,7
+171,7
@@
int sr_cd_check(struct cdrom_device_info *cdi)
no_multi = 0; /* flag: the drive can't handle multisession */
rc = 0;
no_multi = 0; /* flag: the drive can't handle multisession */
rc = 0;
- memset(&cgc, 0, sizeof(struct
cdrom_generic
_command));
+ memset(&cgc, 0, sizeof(struct
packet
_command));
switch (cd->vendor) {
switch (cd->vendor) {