aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/hp/hp100.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-06 09:30:56 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-07 14:22:22 -0500
commit1dd06ae8db716e17ec7e06244b858606edf378c0 (patch)
treeae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/ethernet/hp/hp100.c
parent45122ca26ced7fae41049326a3797a73f961db2e (diff)
drivers/net: fix up function prototypes after __dev* removals
The __dev* removal patches for the network drivers ended up messing up the function prototypes for a bunch of drivers. This patch fixes all of them back up to be properly aligned. Bonus is that this almost removes 100 lines of code, always a nice surprise. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hp/hp100.c')
-rw-r--r--drivers/net/ethernet/hp/hp100.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
index 598e576ddf51..e3c7c697fc45 100644
--- a/drivers/net/ethernet/hp/hp100.c
+++ b/drivers/net/ethernet/hp/hp100.c
@@ -447,8 +447,8 @@ static const struct net_device_ops hp100_netdev_ops = {
447 .ndo_validate_addr = eth_validate_addr, 447 .ndo_validate_addr = eth_validate_addr,
448}; 448};
449 449
450static int hp100_probe1(struct net_device *dev, int ioaddr, 450static int hp100_probe1(struct net_device *dev, int ioaddr, u_char bus,
451 u_char bus, struct pci_dev *pci_dev) 451 struct pci_dev *pci_dev)
452{ 452{
453 int i; 453 int i;
454 int err = -ENODEV; 454 int err = -ENODEV;
@@ -2878,7 +2878,7 @@ static struct eisa_driver hp100_eisa_driver = {
2878 .driver = { 2878 .driver = {
2879 .name = "hp100", 2879 .name = "hp100",
2880 .probe = hp100_eisa_probe, 2880 .probe = hp100_eisa_probe,
2881 .remove = hp100_eisa_remove, 2881 .remove = hp100_eisa_remove,
2882 } 2882 }
2883}; 2883};
2884#endif 2884#endif