Commit 3d0e81be authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] make some gameports compile again

parent fc418145
......@@ -116,7 +116,7 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
gameport_register_port(&gp->gameport);
printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
pci->name, pci->slot_name, gp->gameport.speed);
pci->dev.name, pci->slot_name, gp->gameport.speed);
return 0;
}
......
......@@ -236,7 +236,7 @@ static void ns558_pnp_probe(struct pci_dev *dev)
port->gameport.id.version = 0x100;
sprintf(port->phys, "isapnp%d.%d/gameport0", PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
sprintf(port->name, "%s", dev->name[0] ? dev->name : "NS558 PnP Gameport");
sprintf(port->name, "%s", dev->dev.name[0] ? dev->dev.name : "NS558 PnP Gameport");
gameport_register_port(&port->gameport);
......
......@@ -127,7 +127,7 @@ static int __devinit vortex_probe(struct pci_dev *dev, const struct pci_device_i
vortex->gameport.cooked_read = vortex_cooked_read;
vortex->gameport.open = vortex_open;
vortex->gameport.name = dev->name;
vortex->gameport.name = dev->dev.name;
vortex->gameport.phys = vortex->phys;
vortex->gameport.id.bustype = BUS_PCI;
vortex->gameport.id.vendor = dev->vendor;
......@@ -146,7 +146,7 @@ static int __devinit vortex_probe(struct pci_dev *dev, const struct pci_device_i
gameport_register_port(&vortex->gameport);
printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
dev->name, dev->slot_name, vortex->gameport.speed);
dev->dev.name, dev->slot_name, vortex->gameport.speed);
return 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment