From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 27 Jan 2006 07:29:20 +0000 (-0500)
Subject: Merge branch 'tmp'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~59
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=628e386e27674906326455f01d87878a5f0cbce7;p=linux-2.6-omap-h63xx.git

Merge branch 'tmp'
---

628e386e27674906326455f01d87878a5f0cbce7
diff --cc drivers/scsi/libata-core.c
index 857f535c819,15df633521d..20bccabb54f
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -73,8 -73,6 +73,7 @@@ static int fgb(u32 bitmap)
  static int ata_choose_xfer_mode(const struct ata_port *ap,
  				u8 *xfer_mode_out,
  				unsigned int *xfer_shift_out);
- static void __ata_qc_complete(struct ata_queued_cmd *qc);
 +static void ata_pio_error(struct ata_port *ap);
  
  static unsigned int ata_unique_id = 1;
  static struct workqueue_struct *ata_wq;