From 0c4f8e5ff868b1123e7689e97d6504b26924c918 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sat, 27 Aug 2005 04:13:52 -0400 Subject: [PATCH] --- yaml --- r: 6059 b: refs/heads/master c: d18d36b4edbb980c9de7fe00724c3ded5de1b7a7 h: refs/heads/master i: 6057: ecdc0ce7a3a07ff6ce32feb315d4ee2a75e77b1e 6055: c3a59b19d77a622402cf38d9b6062b596e67c08b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sata_qstor.c | 2 +- trunk/include/linux/libata.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7670ae039f69..2c7341f0e2ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 953d1137fc4aba16deace262e93974913596dcfe +refs/heads/master: d18d36b4edbb980c9de7fe00724c3ded5de1b7a7 diff --git a/trunk/drivers/scsi/sata_qstor.c b/trunk/drivers/scsi/sata_qstor.c index 2926846cdd6a..93fd06fb4f15 100644 --- a/trunk/drivers/scsi/sata_qstor.c +++ b/trunk/drivers/scsi/sata_qstor.c @@ -198,7 +198,7 @@ static int qs_check_atapi_dma(struct ata_queued_cmd *qc) return 1; /* ATAPI DMA not supported */ } -static void qs_bmdma_stop(struct ata_queud_cmd *qc) +static void qs_bmdma_stop(struct ata_queued_cmd *qc) { /* nothing */ } diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 33f3ab4eb827..7c09540c52bc 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -424,7 +424,6 @@ extern unsigned int ata_dev_classify(struct ata_taskfile *tf); extern void ata_dev_id_string(u16 *id, unsigned char *s, unsigned int ofs, unsigned int len); extern void ata_dev_config(struct ata_port *ap, unsigned int i); -extern void ata_dev_set_protocol(struct ata_device *dev); extern void ata_bmdma_setup (struct ata_queued_cmd *qc); extern void ata_bmdma_start (struct ata_queued_cmd *qc); extern void ata_bmdma_stop(struct ata_queued_cmd *qc);