]> err.no Git - linux-2.6/commitdiff
ide: au1xxx: fix use of mixed declarations and code
authorRalf Baechle <ralf@linux-mips.org>
Sat, 17 Mar 2007 20:57:24 +0000 (21:57 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 17 Mar 2007 20:57:24 +0000 (21:57 +0100)
drivers/ide/mips/au1xxx-ide.c:684: warning: ISO C90 forbids mixed declarations and code

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/mips/au1xxx-ide.c

index b2dc028dc8ca17d424cc5677e070cdcf374f9e87..d54d9fe92a7d548324b38809d360fe1c280722fa 100644 (file)
@@ -639,6 +639,7 @@ static int au_ide_probe(struct device *dev)
        _auide_hwif *ahwif = &auide_hwif;
        ide_hwif_t *hwif;
        struct resource *res;
+       hw_regs_t *hw;
        int ret = 0;
 
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
@@ -681,7 +682,7 @@ static int au_ide_probe(struct device *dev)
        /* FIXME:  This might possibly break PCMCIA IDE devices */
 
        hwif                            = &ide_hwifs[pdev->id];
-       hw_regs_t *hw                   = &hwif->hw;
+       hw                              = &hwif->hw;
        hwif->irq = hw->irq             = ahwif->irq;
        hwif->chipset                   = ide_au1xxx;