summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion/s2io.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-06 15:30:56 +0100
committerDavid S. Miller <davem@davemloft.net>2012-12-07 20:22:22 +0100
commit1dd06ae8db716e17ec7e06244b858606edf378c0 (patch)
treeae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/ethernet/neterion/s2io.h
parentsctp: Add RCU protection to assoc->transport_addr_list (diff)
downloadlinux-1dd06ae8db716e17ec7e06244b858606edf378c0.tar.xz
linux-1dd06ae8db716e17ec7e06244b858606edf378c0.zip
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/neterion/s2io.h')
-rw-r--r--drivers/net/ethernet/neterion/s2io.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.h b/drivers/net/ethernet/neterion/s2io.h
index 032f9b6d850d..d89b6ed82c51 100644
--- a/drivers/net/ethernet/neterion/s2io.h
+++ b/drivers/net/ethernet/neterion/s2io.h
@@ -1075,8 +1075,7 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
/*
* Prototype declaration.
*/
-static int s2io_init_nic(struct pci_dev *pdev,
- const struct pci_device_id *pre);
+static int s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre);
static void s2io_rem_nic(struct pci_dev *pdev);
static int init_shared_mem(struct s2io_nic *sp);
static void free_shared_mem(struct s2io_nic *sp);