diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-06 09:30:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-07 14:22:22 -0500 |
commit | 1dd06ae8db716e17ec7e06244b858606edf378c0 (patch) | |
tree | ae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/ethernet/micrel/ksz884x.c | |
parent | 45122ca26ced7fae41049326a3797a73f961db2e (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/micrel/ksz884x.c')
-rw-r--r-- | drivers/net/ethernet/micrel/ksz884x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index f3f09b18a70..093d594435e 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c | |||
@@ -6919,8 +6919,7 @@ static void read_other_addr(struct ksz_hw *hw) | |||
6919 | #define PCI_VENDOR_ID_MICREL_KS 0x16c6 | 6919 | #define PCI_VENDOR_ID_MICREL_KS 0x16c6 |
6920 | #endif | 6920 | #endif |
6921 | 6921 | ||
6922 | static int pcidev_init(struct pci_dev *pdev, | 6922 | static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id) |
6923 | const struct pci_device_id *id) | ||
6924 | { | 6923 | { |
6925 | struct net_device *dev; | 6924 | struct net_device *dev; |
6926 | struct dev_priv *priv; | 6925 | struct dev_priv *priv; |