diff options
Diffstat (limited to 'drivers/net/ethernet/dec')
-rw-r--r-- | drivers/net/ethernet/dec/tulip/de2104x.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/dec/tulip/de4x5.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/dec/tulip/dmfe.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/dec/tulip/tulip_core.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/dec/tulip/winbond-840.c | 3 |
5 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c index 0918e3879ab..eaab73cf27c 100644 --- a/drivers/net/ethernet/dec/tulip/de2104x.c +++ b/drivers/net/ethernet/dec/tulip/de2104x.c | |||
@@ -1962,8 +1962,7 @@ static const struct net_device_ops de_netdev_ops = { | |||
1962 | .ndo_validate_addr = eth_validate_addr, | 1962 | .ndo_validate_addr = eth_validate_addr, |
1963 | }; | 1963 | }; |
1964 | 1964 | ||
1965 | static int de_init_one(struct pci_dev *pdev, | 1965 | static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
1966 | const struct pci_device_id *ent) | ||
1967 | { | 1966 | { |
1968 | struct net_device *dev; | 1967 | struct net_device *dev; |
1969 | struct de_private *de; | 1968 | struct de_private *de; |
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index c411aedd8e6..4c830030fb0 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c | |||
@@ -2104,7 +2104,7 @@ static struct eisa_driver de4x5_eisa_driver = { | |||
2104 | .driver = { | 2104 | .driver = { |
2105 | .name = "de4x5", | 2105 | .name = "de4x5", |
2106 | .probe = de4x5_eisa_probe, | 2106 | .probe = de4x5_eisa_probe, |
2107 | .remove = de4x5_eisa_remove, | 2107 | .remove = de4x5_eisa_remove, |
2108 | } | 2108 | } |
2109 | }; | 2109 | }; |
2110 | MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); | 2110 | MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); |
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 56a8fe7d4ef..83139307861 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c | |||
@@ -367,8 +367,7 @@ static const struct net_device_ops netdev_ops = { | |||
367 | * Search DM910X board ,allocate space and register it | 367 | * Search DM910X board ,allocate space and register it |
368 | */ | 368 | */ |
369 | 369 | ||
370 | static int dmfe_init_one(struct pci_dev *pdev, | 370 | static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
371 | const struct pci_device_id *ent) | ||
372 | { | 371 | { |
373 | struct dmfe_board_info *db; /* board information structure */ | 372 | struct dmfe_board_info *db; /* board information structure */ |
374 | struct net_device *dev; | 373 | struct net_device *dev; |
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 157c8e6e93f..1e9443d9fb5 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c | |||
@@ -1191,8 +1191,7 @@ static void set_rx_mode(struct net_device *dev) | |||
1191 | } | 1191 | } |
1192 | 1192 | ||
1193 | #ifdef CONFIG_TULIP_MWI | 1193 | #ifdef CONFIG_TULIP_MWI |
1194 | static void tulip_mwi_config(struct pci_dev *pdev, | 1194 | static void tulip_mwi_config(struct pci_dev *pdev, struct net_device *dev) |
1195 | struct net_device *dev) | ||
1196 | { | 1195 | { |
1197 | struct tulip_private *tp = netdev_priv(dev); | 1196 | struct tulip_private *tp = netdev_priv(dev); |
1198 | u8 cache; | 1197 | u8 cache; |
@@ -1301,8 +1300,7 @@ DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = { | |||
1301 | { }, | 1300 | { }, |
1302 | }; | 1301 | }; |
1303 | 1302 | ||
1304 | static int tulip_init_one(struct pci_dev *pdev, | 1303 | static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
1305 | const struct pci_device_id *ent) | ||
1306 | { | 1304 | { |
1307 | struct tulip_private *tp; | 1305 | struct tulip_private *tp; |
1308 | /* See note below on the multiport cards. */ | 1306 | /* See note below on the multiport cards. */ |
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 0a1bda857e7..c7b04ecf5b4 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c | |||
@@ -358,8 +358,7 @@ static const struct net_device_ops netdev_ops = { | |||
358 | .ndo_validate_addr = eth_validate_addr, | 358 | .ndo_validate_addr = eth_validate_addr, |
359 | }; | 359 | }; |
360 | 360 | ||
361 | static int w840_probe1(struct pci_dev *pdev, | 361 | static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) |
362 | const struct pci_device_id *ent) | ||
363 | { | 362 | { |
364 | struct net_device *dev; | 363 | struct net_device *dev; |
365 | struct netdev_private *np; | 364 | struct netdev_private *np; |