Emu10k1 gameport fix

diff -urN -X scripts/dontdiff linux-2.5.47-bk3/drivers/input/gameport/emu10k1-gp.c linux/drivers/input/gameport/emu10k1-gp.c
@@ -84,7 +84,7 @@
 	emu->dev = pdev;
 
 	emu->gameport.io = ioport;
-	emu->gameport.name = pdev->name;
+	emu->gameport.name = pdev->dev.name;
 	emu->gameport.phys = emu->phys;
 	emu->gameport.id.bustype = BUS_PCI;
 	emu->gameport.id.vendor = pdev->vendor;

@@ -95,7 +95,7 @@
 	gameport_register_port(&emu->gameport);
 
 	printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
-		pdev->name, pdev->slot_name, emu->gameport.speed);
+		emu->gameport.name, pdev->slot_name, emu->gameport.speed);
 
 	return 0;
 }