From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 24 Mar 2006 17:29:39 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: Ubuntu-5.0.0-8.9~48754^2~98^2~13^2~30
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99;p=mirror_ubuntu-disco-kernel.git

Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c
---

4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99
diff --cc drivers/scsi/libata-core.c
index dcce0f494d4a,0aff888d9ecd..c3c4263fdb12
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -64,10 -64,9 +64,10 @@@
  static unsigned int ata_dev_init_params(struct ata_port *ap,
  					struct ata_device *dev);
  static void ata_set_mode(struct ata_port *ap);
- static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev);
+ static unsigned int ata_dev_set_xfermode(struct ata_port *ap,
+ 					 struct ata_device *dev);
+ static void ata_dev_xfermask(struct ata_port *ap, struct ata_device *dev);
 +static void ata_pio_error(struct ata_port *ap);
- static unsigned int ata_dev_xfermask(struct ata_port *ap,
- 				     struct ata_device *dev);
  
  static unsigned int ata_unique_id = 1;
  static struct workqueue_struct *ata_wq;
diff --cc drivers/scsi/sata_vsc.c
index 9f621a97c977,836bbbb26ff2..5af6d5f9f4bd
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@@ -233,11 -226,11 +233,11 @@@ static irqreturn_t vsc_sata_interrupt (
  				struct ata_queued_cmd *qc;
  
  				qc = ata_qc_from_tag(ap, ap->active_tag);
 -				if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
 +				if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)))
  					handled += ata_host_intr(ap, qc);
 -				} else if (is_vsc_sata_int_err(i, int_status)) {
 +				else if (is_vsc_sata_int_err(i, int_status)) {
  					/*
- 					 * On some chips (i.e. Intel 31244), an error 
+ 					 * On some chips (i.e. Intel 31244), an error
  					 * interrupt will sneak in at initialization
  					 * time (phy state changes).  Clearing the SCR
  					 * error register is not required, but it prevents