diff options
Diffstat (limited to 'drivers/net/atl1e/atl1e_main.c')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 08f8c0969e9..d59f8e89c65 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -35,7 +35,7 @@ char atl1e_driver_version[] = DRV_VERSION; | |||
35 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, | 35 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, |
36 | * Class, Class Mask, private data (not used) } | 36 | * Class, Class Mask, private data (not used) } |
37 | */ | 37 | */ |
38 | static struct pci_device_id atl1e_pci_tbl[] = { | 38 | static DEFINE_PCI_DEVICE_TABLE(atl1e_pci_tbl) = { |
39 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)}, | 39 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)}, |
40 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)}, | 40 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)}, |
41 | /* required last entry */ | 41 | /* required last entry */ |
@@ -2378,10 +2378,7 @@ static int __devinit atl1e_probe(struct pci_dev *pdev, | |||
2378 | 2378 | ||
2379 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); | 2379 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); |
2380 | memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); | 2380 | memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); |
2381 | dev_dbg(&pdev->dev, "mac address : %02x-%02x-%02x-%02x-%02x-%02x\n", | 2381 | dev_dbg(&pdev->dev, "mac address : %pM\n", adapter->hw.mac_addr); |
2382 | adapter->hw.mac_addr[0], adapter->hw.mac_addr[1], | ||
2383 | adapter->hw.mac_addr[2], adapter->hw.mac_addr[3], | ||
2384 | adapter->hw.mac_addr[4], adapter->hw.mac_addr[5]); | ||
2385 | 2382 | ||
2386 | INIT_WORK(&adapter->reset_task, atl1e_reset_task); | 2383 | INIT_WORK(&adapter->reset_task, atl1e_reset_task); |
2387 | INIT_WORK(&adapter->link_chg_task, atl1e_link_chg_task); | 2384 | INIT_WORK(&adapter->link_chg_task, atl1e_link_chg_task); |