1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index dd2583ef1ad..6b10ae260fa 100644
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -35,13 +35,13 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
         u16 reg;
         struct pci_dev *dev = hwif->pci_dev;
 
-        hwif->chipset = ide_rz1000;
         if (!pci_read_config_word (dev, 0x40, &reg) &&
             !pci_write_config_word(dev, 0x40, reg & 0xdfff)) {
                 printk(KERN_INFO "%s: disabled chipset read-ahead "
                         "(buggy RZ1000/RZ1001)\n", hwif->name);
         } else {
-                hwif->serialized = 1;
+                if (hwif->mate)
+                        hwif->mate->serialized = hwif->serialized = 1;
                 hwif->drives[0].no_unmask = 1;
                 hwif->drives[1].no_unmask = 1;
                 printk(KERN_INFO "%s: serialized, disabled unmasking "
@@ -49,9 +49,10 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
         }
 }
 
-static ide_pci_device_t rz1000_chipset __devinitdata = {
+static const struct ide_port_info rz1000_chipset __devinitdata = {
         .name           = "RZ100x",
         .init_hwif      = init_hwif_rz1000,
+        .chipset        = ide_rz1000,
         .host_flags     = IDE_HFLAG_NO_DMA | IDE_HFLAG_BOOTABLE,
 };