From 449af10bcb12b32f2a4cee72b48960c66b4ba9a1 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 21 Aug 2010 10:43:25 +0200
Subject: [PATCH] --- yaml --- r: 210014 b: refs/heads/master c:
 d26377b83972917cfb8f5bee193981aaa1130627 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/ata/sata_dwc_460ex.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95c6a2accc54..35e166bdd3be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f173107ecad83a50fc297f5a99bcda961501fc9
+refs/heads/master: d26377b83972917cfb8f5bee193981aaa1130627
diff --git a/trunk/drivers/ata/sata_dwc_460ex.c b/trunk/drivers/ata/sata_dwc_460ex.c
index 2673a3d14806..6cf57c5c2b5f 100644
--- a/trunk/drivers/ata/sata_dwc_460ex.c
+++ b/trunk/drivers/ata/sata_dwc_460ex.c
@@ -1459,7 +1459,7 @@ static void sata_dwc_qc_prep_by_tag(struct ata_queued_cmd *qc, u8 tag)
 {
 	struct scatterlist *sg = qc->sg;
 	struct ata_port *ap = qc->ap;
-	u32 dma_chan;
+	int dma_chan;
 	struct sata_dwc_device *hsdev = HSDEV_FROM_AP(ap);
 	struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);
 	int err;