git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
[pandora-kernel.git]
/
drivers
/
ide
/
ide-cd.h
diff --git
a/drivers/ide/ide-cd.h
b/drivers/ide/ide-cd.h
index
22e3751
..
fe0ea36
100644
(file)
--- a/
drivers/ide/ide-cd.h
+++ b/
drivers/ide/ide-cd.h
@@
-119,10
+119,6
@@
struct cdrom_info {
struct atapi_toc *toc;
struct atapi_toc *toc;
- unsigned long sector_buffered;
- unsigned long nsectors_buffered;
- unsigned char *buffer;
-
/* The result of the last successful request sense command
on this device. */
struct request_sense sense_data;
/* The result of the last successful request sense command
on this device. */
struct request_sense sense_data;
@@
-147,8
+143,8
@@
struct cdrom_info {
void ide_cd_log_error(const char *, struct request *, struct request_sense *);
/* ide-cd.c functions used by ide-cd_ioctl.c */
void ide_cd_log_error(const char *, struct request *, struct request_sense *);
/* ide-cd.c functions used by ide-cd_ioctl.c */
-void ide_cd_init_rq(ide_drive_t *, struct request *);
-
int ide_cd_queue_pc(ide_drive_t *, struct request *
);
+int ide_cd_queue_pc(ide_drive_t *, const unsigned char *, int, void *,
+
unsigned *, struct request_sense *, int, unsigned int
);
int ide_cd_read_toc(ide_drive_t *, struct request_sense *);
int ide_cdrom_get_capabilities(ide_drive_t *, u8 *);
void ide_cdrom_update_speed(ide_drive_t *, u8 *);
int ide_cd_read_toc(ide_drive_t *, struct request_sense *);
int ide_cdrom_get_capabilities(ide_drive_t *, u8 *);
void ide_cdrom_update_speed(ide_drive_t *, u8 *);