Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / drivers / ata / pata_ixp4xx_cf.c

diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 76332109a4f73dc813d804aa14ff14d7be83f4df..4ca7fd6118d50f6d52a1b7c464d1266614282b2d 100644 (file)
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -171,7 +171,6 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
        struct ata_host *host;
        struct ata_port *ap;
        struct ixp4xx_pata_data *data = pdev->dev.platform_data;
-       int rc;
 
        cs0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        cs1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);