Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...

diff --combined drivers/net/r8169.c
index c3015d6,93cd1f4..7ac5994
--- 1/drivers/net/r8169.c
--- 2/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@@ -210,7 -210,7 +210,7 @@@ static const struct 
  static struct pci_device_id rtl8169_pci_tbl[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8129), 0, 0, RTL_CFG_0 },
        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8136), 0, 0, RTL_CFG_2 },
-       { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8167), 0, 0, RTL_CFG_1 },
+       { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8167), 0, 0, RTL_CFG_0 },
        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8168), 0, 0, RTL_CFG_2 },
        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8169), 0, 0, RTL_CFG_0 },
        { PCI_DEVICE(PCI_VENDOR_ID_DLINK,       0x4300), 0, 0, RTL_CFG_0 },
@@@ -1124,7 -1124,7 +1124,7 @@@ static void rtl8169_get_strings(struct 
  }
  
  
 -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 +2913,7 @@@ static struct pci_driver rtl8169_pci_dr
  static int __init
  rtl8169_init_module(void)
  {
 -      return pci_module_init(&rtl8169_pci_driver);
 +      return pci_register_driver(&rtl8169_pci_driver);
  }
  
  static void __exit