tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Jeff Garzik e7f52e4c 249b94a5

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