aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r--drivers/net/ethernet/marvell/skge.c3
-rw-r--r--drivers/net/ethernet/marvell/sky2.c8
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 3d66e959a0c..5544a1fe2f9 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -3869,8 +3869,7 @@ static void skge_show_addr(struct net_device *dev)
3869 3869
3870static int only_32bit_dma; 3870static int only_32bit_dma;
3871 3871
3872static int skge_probe(struct pci_dev *pdev, 3872static int skge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3873 const struct pci_device_id *ent)
3874{ 3873{
3875 struct net_device *dev, *dev1; 3874 struct net_device *dev, *dev1;
3876 struct skge_hw *hw; 3875 struct skge_hw *hw;
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 6ddfbcae780..3269eb38cc5 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4741,9 +4741,8 @@ static const struct net_device_ops sky2_netdev_ops[2] = {
4741}; 4741};
4742 4742
4743/* Initialize network device */ 4743/* Initialize network device */
4744static struct net_device *sky2_init_netdev(struct sky2_hw *hw, 4744static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,
4745 unsigned port, 4745 int highmem, int wol)
4746 int highmem, int wol)
4747{ 4746{
4748 struct sky2_port *sky2; 4747 struct sky2_port *sky2;
4749 struct net_device *dev = alloc_etherdev(sizeof(*sky2)); 4748 struct net_device *dev = alloc_etherdev(sizeof(*sky2));
@@ -4896,8 +4895,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
4896 return buf; 4895 return buf;
4897} 4896}
4898 4897
4899static int sky2_probe(struct pci_dev *pdev, 4898static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
4900 const struct pci_device_id *ent)
4901{ 4899{
4902 struct net_device *dev, *dev1; 4900 struct net_device *dev, *dev1;
4903 struct sky2_hw *hw; 4901 struct sky2_hw *hw;