From: akpm@linux-foundation.org Date: Thu, 17 Jan 2008 19:33:52 +0000 (-0800) Subject: fix drivers/ata/sata_fsl.c double-decl X-Git-Tag: v2.6.25-rc1~1233^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a984f58dd97f22f5113700322fed311a0ee29947;p=linux-2.6-omap-h63xx.git fix drivers/ata/sata_fsl.c double-decl drivers/ata/sata_fsl.c: In function 'sata_fsl_fill_sg': drivers/ata/sata_fsl.c:337: error: redeclaration of 'si' with no linkage drivers/ata/sata_fsl.c:326: error: previous declaration of 'si' was here Reported-by: Olof Johansson Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index d041709dee1..922d7b2efba 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c @@ -323,7 +323,6 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc, struct scatterlist *sg; unsigned int num_prde = 0; u32 ttl_dwords = 0; - unsigned int si; /* * NOTE : direct & indirect prdt's are contigiously allocated