Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6

+2 -2
+2 -2
drivers/net/sis190.c
··· 1791 1791 goto out; 1792 1792 } 1793 1793 1794 + pci_set_drvdata(pdev, dev); 1795 + 1794 1796 tp = netdev_priv(dev); 1795 1797 ioaddr = tp->mmio_addr; 1796 1798 ··· 1828 1826 rc = register_netdev(dev); 1829 1827 if (rc < 0) 1830 1828 goto err_remove_mii; 1831 - 1832 - pci_set_drvdata(pdev, dev); 1833 1829 1834 1830 net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), " 1835 1831 "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",