Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / drivers / ide / legacy / ide_platform.c

diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c
index ccfb9893a467047ff6db738a14f8df772ffec545..b992b2b91fe2ba684dadbc7345ffb96d4161f8bc 100644 (file)
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
@@ -65,7 +65,7 @@ found:
        hwif->hw.irq = hwif->irq = irq;
 
        hwif->hw.dma = NO_DMA;
-       hwif->hw.chipset = ide_generic;
+       hwif->chipset = hwif->hw.chipset = ide_generic;
 
        if (mmio) {
                hwif->mmio = 1;