diff options
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 60f96c468a24..c1bb24cf0793 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -168,7 +168,7 @@ static void rtl_hw_start_8169(struct net_device *); | |||
168 | static void rtl_hw_start_8168(struct net_device *); | 168 | static void rtl_hw_start_8168(struct net_device *); |
169 | static void rtl_hw_start_8101(struct net_device *); | 169 | static void rtl_hw_start_8101(struct net_device *); |
170 | 170 | ||
171 | static struct pci_device_id rtl8169_pci_tbl[] = { | 171 | static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = { |
172 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 }, | 172 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 }, |
173 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 }, | 173 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 }, |
174 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, | 174 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, |
@@ -3188,15 +3188,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3188 | if (netif_msg_probe(tp)) { | 3188 | if (netif_msg_probe(tp)) { |
3189 | u32 xid = RTL_R32(TxConfig) & 0x9cf0f8ff; | 3189 | u32 xid = RTL_R32(TxConfig) & 0x9cf0f8ff; |
3190 | 3190 | ||
3191 | printk(KERN_INFO "%s: %s at 0x%lx, " | 3191 | printk(KERN_INFO "%s: %s at 0x%lx, %pM, XID %08x IRQ %d\n", |
3192 | "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, " | ||
3193 | "XID %08x IRQ %d\n", | ||
3194 | dev->name, | 3192 | dev->name, |
3195 | rtl_chip_info[tp->chipset].name, | 3193 | rtl_chip_info[tp->chipset].name, |
3196 | dev->base_addr, | 3194 | dev->base_addr, dev->dev_addr, xid, dev->irq); |
3197 | dev->dev_addr[0], dev->dev_addr[1], | ||
3198 | dev->dev_addr[2], dev->dev_addr[3], | ||
3199 | dev->dev_addr[4], dev->dev_addr[5], xid, dev->irq); | ||
3200 | } | 3195 | } |
3201 | 3196 | ||
3202 | rtl8169_init_phy(dev, tp); | 3197 | rtl8169_init_phy(dev, tp); |