Merge /spare/repo/linux-2.6/

2005-09-08 05:39:55 -04:00
parent 2fcf522509 caf39e87cc
commit c324b44c34
2288 changed files with 125762 additions and 53211 deletions
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -38,6 +38,7 @@ struct ata_scsi_args {
 };

 /* libata-core.c */
+extern int atapi_enabled;
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
 				      struct ata_device *dev);
 extern void ata_qc_free(struct ata_queued_cmd *qc);