aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/3com/3c59x.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/3com/3c59x.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/3com/3c59x.c')
-rw-r--r--drivers/net/ethernet/3com/3c59x.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 658e224b3613..ed0feb3cc6fa 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -1001,7 +1001,7 @@ static int __init vortex_eisa_init(void)
1001 1001
1002/* returns count (>= 0), or negative on error */ 1002/* returns count (>= 0), or negative on error */
1003static int vortex_init_one(struct pci_dev *pdev, 1003static int vortex_init_one(struct pci_dev *pdev,
1004 const struct pci_device_id *ent) 1004 const struct pci_device_id *ent)
1005{ 1005{
1006 int rc, unit, pci_bar; 1006 int rc, unit, pci_bar;
1007 struct vortex_chip_info *vci; 1007 struct vortex_chip_info *vci;
@@ -1088,9 +1088,8 @@ static const struct net_device_ops vortex_netdev_ops = {
1088 * 1088 *
1089 * NOTE: pdev can be NULL, for the case of a Compaq device 1089 * NOTE: pdev can be NULL, for the case of a Compaq device
1090 */ 1090 */
1091static int vortex_probe1(struct device *gendev, 1091static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
1092 void __iomem *ioaddr, int irq, 1092 int chip_idx, int card_idx)
1093 int chip_idx, int card_idx)
1094{ 1093{
1095 struct vortex_private *vp; 1094 struct vortex_private *vp;
1096 int option; 1095 int option;