summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-03-17 21:57:24 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-03-17 21:57:24 +0100
commit1918fd63de6d222c049cdeae4aa113a6f0593187 (patch)
tree206762dad01bcbc32101d950075cd86382a9df5c
parente277a1aaa97abdc1b0a0b8a8c062e29220b00440 (diff)
downloadblackbird-obmc-linux-1918fd63de6d222c049cdeae4aa113a6f0593187.tar.gz
blackbird-obmc-linux-1918fd63de6d222c049cdeae4aa113a6f0593187.zip
ide: au1xxx: fix use of mixed declarations and code
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>
-rw-r--r--drivers/ide/mips/au1xxx-ide.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index b2dc028dc8ca..d54d9fe92a7d 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -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;
OpenPOWER on IntegriCloud