X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=drivers%2Fnet%2Fr8169.c;h=7ac599410978cfef79662909b4ca849afb1977c2;hp=93cd1f4bfcf24a50593d1efd061c62616544558c;hb=78cc3b78c4208d28e7f4ecded82e238224ed4d1c;hpb=d81bf551103cc3bc9e4f7ddf337511d6da0d088f;ds=sidebyside

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 93cd1f4bfcf2..7ac599410978 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1124,7 +1124,7 @@ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data)
 }
 
 
-static struct ethtool_ops rtl8169_ethtool_ops = {
+static const struct ethtool_ops rtl8169_ethtool_ops = {
 	.get_drvinfo		= rtl8169_get_drvinfo,
 	.get_regs_len		= rtl8169_get_regs_len,
 	.get_link		= ethtool_op_get_link,
@@ -2913,7 +2913,7 @@ static struct pci_driver rtl8169_pci_driver = {
 static int __init
 rtl8169_init_module(void)
 {
-	return pci_module_init(&rtl8169_pci_driver);
+	return pci_register_driver(&rtl8169_pci_driver);
 }
 
 static void __exit