diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 08:50:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 08:50:36 -0400 |
| commit | 94f8c66e5e543d79231abf203d6e514ecb668688 (patch) | |
| tree | 79f240cb13dd3da5879a7cf52ca1beca4650311d /drivers/scsi/libata.h | |
| parent | da1f136c26d45c57e8b2d711bf17a6e5ec4de2d1 (diff) | |
| parent | d0bd99299bf933ae006d2dc6a31ffcba482ae3f2 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/libata.h')
| -rw-r--r-- | drivers/scsi/libata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index 809c634afbcd..d608b3a0f6fe 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
| @@ -38,6 +38,7 @@ struct ata_scsi_args { | |||
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | /* libata-core.c */ | 40 | /* libata-core.c */ |
| 41 | extern int atapi_enabled; | ||
| 41 | extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, | 42 | extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, |
| 42 | struct ata_device *dev); | 43 | struct ata_device *dev); |
| 43 | extern void ata_qc_free(struct ata_queued_cmd *qc); | 44 | extern void ata_qc_free(struct ata_queued_cmd *qc); |